Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feature(devmap): split build into bitmap to enable devmap and devblock seperately #187

Merged
merged 1 commit into from
Jan 23, 2024
Merged

feature(devmap): split build into bitmap to enable devmap and devblock seperately #187

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions include/xsk/arc/common/types.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,18 @@ enum class instance : u8

enum class build : u8
{
dev,
prod,
prod = 0 << 0,
dev_blocks = 1 << 0,
dev_maps = 1 << 1,

dev = dev_blocks | dev_maps,
};

inline build operator&(build lhs, build rhs)
{
return static_cast<build>(static_cast<std::underlying_type<build>::type>(lhs) & static_cast<std::underlying_type<build>::type>(rhs));
}

enum class endian : u8
{
little,
Expand Down
12 changes: 10 additions & 2 deletions include/xsk/gsc/common/types.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,18 @@ enum class instance : u8

enum class build : u8
{
dev,
prod,
prod = 0 << 0,
dev_blocks = 1 << 0,
dev_maps = 1 << 1,

dev = dev_blocks | dev_maps,
};

inline build operator&(build lhs, build rhs)
{
return static_cast<build>(static_cast<std::underlying_type<build>::type>(lhs) & static_cast<std::underlying_type<build>::type>(rhs));
}

enum class endian : u8
{
little,
Expand Down
12 changes: 8 additions & 4 deletions src/arc/assembler.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -279,10 +279,14 @@ auto assembler::assemble_function(function& func) -> void
auto assembler::assemble_instruction(instruction const& inst) -> void
{
script_.write<u8>(static_cast<u8>(ctx_->opcode_id(inst.opcode)));
devmap_.write<u32>(script_.pos());
devmap_.write<u16>(inst.pos.line);
devmap_.write<u16>(inst.pos.column);
devmap_count_++;

if ((ctx_->build() & build::dev_maps) != build::prod)
{
devmap_.write<u32>(script_.pos());
devmap_.write<u16>(inst.pos.line);
devmap_.write<u16>(inst.pos.column);
devmap_count_++;
}

switch (inst.opcode)
{
Expand Down
2 changes: 1 addition & 1 deletion src/arc/lexer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ auto lexer::lex() -> token
if (indev_)
throw comp_error(loc_, "cannot recurse devblock ('/#')");

if (ctx_->build() == build::dev)
if ((ctx_->build() & build::dev_blocks) != build::prod)
{
indev_ = true;
return token{ token::DEVBEGIN, spacing_, loc_ };
Expand Down
12 changes: 8 additions & 4 deletions src/gsc/assembler.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,10 +70,14 @@ auto assembler::assemble_function(function const& func) -> void
auto assembler::assemble_instruction(instruction const& inst) -> void
{
script_.write<u8>(ctx_->opcode_id(inst.opcode));
devmap_.write<u32>(script_.pos());
devmap_.write<u16>(inst.pos.line);
devmap_.write<u16>(inst.pos.column);
devmap_count_++;

if ((ctx_->build() & build::dev_maps) != build::prod)
{
devmap_.write<u32>(script_.pos());
devmap_.write<u16>(inst.pos.line);
devmap_.write<u16>(inst.pos.column);
devmap_count_++;
}

switch (inst.opcode)
{
Expand Down
2 changes: 1 addition & 1 deletion src/gsc/lexer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ auto lexer::lex() -> token
if (indev_)
throw comp_error(loc_, "cannot recurse devblock ('/#')");

if (ctx_->build() == build::dev)
if ((ctx_->build() & build::dev_blocks) != build::prod)
{
indev_ = true;
return token{ token::DEVBEGIN, spacing_, loc_ };
Expand Down
4 changes: 2 additions & 2 deletions src/tool/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -296,7 +296,7 @@ auto compile_file(game game, mach mach, fs::path file, fs::path rel) -> result
utils::file::save(fs::path{ "compiled" } / rel, result);
std::cout << fmt::format("compiled {}\n", rel.generic_string());

if (contexts[game][mach]->build() == build::dev)
if ((contexts[game][mach]->build() & build::dev_maps) != build::prod)
{
utils::file::save(fs::path{ "compiled" } / fs::path{ "developer_maps" } / rel.replace_extension(".gscmap"), std::get<2>(outbin).data, std::get<2>(outbin).size);
std::cout << fmt::format("saved developer map {}\n", rel.generic_string());
Expand Down Expand Up @@ -803,7 +803,7 @@ auto compile_file(game game, mach mach, fs::path const& file, fs::path rel) -> r
utils::file::save(fs::path{ "compiled" } / rel, outbin.first.data, outbin.first.size);
std::cout << fmt::format("compiled {}\n", rel.generic_string());

if (contexts[game][mach]->build() == build::dev)
if ((contexts[game][mach]->build() & build::dev_maps) != build::prod)
{
utils::file::save(fs::path{ "compiled" } / fs::path{ "developer_maps" } / rel.replace_extension((rel.extension().string().starts_with(".gsc") ? ".gscmap" : ".cscmap")), outbin.second.data, outbin.second.size);
std::cout << fmt::format("saved developer map {}\n", rel.generic_string());
Expand Down
Loading