Skip to content

Repository navigation

debuggged .ds #79

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

Merged
pebmeister merged 1 commit into from
Oct 16, 2026
Merged

debuggged .ds #79

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
9 changes: 6 additions & 3 deletions multipassassembler.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -921,6 +921,8 @@ void MultiPassAssembler::EmitFinalPass(const std::vector<std::unique_ptr<Stateme
// helper to write bytes to output
auto emit_bytes = [&](std::vector<uint8_t>& emitted_bytes) {
if (!load_address_set) {
std::cout << std::format("auto set loadaddress ${:04X}", pc);

load_address = pc;
load_address_set = true;
if (options.verbose) {
Expand Down Expand Up @@ -977,12 +979,12 @@ void MultiPassAssembler::EmitFinalPass(const std::vector<std::unique_ptr<Stateme
std::format("Invalid value File: {} Line:{}", src_mgr.GetFileName(stmt->file), stmt->line)
);
}
pc = static_cast<uint16_t>(val.value());
pc = static_cast<uint16_t>(val.value());
if (org_stmt->isOrg && load_address_set) {
throw std::runtime_error(
std::format("Org already set ${:04X} File: {} Line:{}", load_address, src_mgr.GetFileName(stmt->file), stmt->line));
}
if (!load_address_set) {
if (!load_address_set) {
load_address = pc;
load_address_set = true;
}
Expand Down Expand Up @@ -1141,7 +1143,8 @@ void MultiPassAssembler::EmitFinalPass(const std::vector<std::unique_ptr<Stateme
}

if (count > 0) {
if (pc >= load_address) {
auto sz = binary_output.size();
if (sz + load_address == pc) {
std::vector<uint8_t> bytes(count, 0x00);
emit_bytes(bytes); // Note: emit_bytes advances pc by bytes.size()
if (printstate) {
Expand Down
Loading