diff options
author | nc <charles.saternos@gmail.com> | 2019-05-01 21:06:50 -0400 |
---|---|---|
committer | nc <charles.saternos@gmail.com> | 2019-05-01 21:06:50 -0400 |
commit | 2827336d9917bccd7486eede0b1434002993342a (patch) | |
tree | b4f30dc7edf17d4e150ecd177342d65584c3eca7 /subx/036global_variables.cc | |
parent | bcd2b245aa564f0b2b55404c885e330515b8bbd2 (diff) | |
parent | 02684e8d7cb5292867ebcdea06879b94ba63aef4 (diff) | |
download | mu-2827336d9917bccd7486eede0b1434002993342a.tar.gz |
Merge branch 'master' into charles-l-print-int-decimal
Diffstat (limited to 'subx/036global_variables.cc')
-rw-r--r-- | subx/036global_variables.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/subx/036global_variables.cc b/subx/036global_variables.cc index 846cd291..fffabf72 100644 --- a/subx/036global_variables.cc +++ b/subx/036global_variables.cc @@ -54,8 +54,8 @@ void compute_addresses_for_global_variables(const segment& s, map<string, uint32 if (trace_contains_errors()) return; if (j > 0) raise << "'" << to_string(inst) << "': global variable names can only be the first word in a line.\n" << end(); - if (Map_file.is_open()) - Map_file << "0x" << HEXWORD << current_address << ' ' << variable << '\n'; + if (Labels_file.is_open()) + Labels_file << "0x" << HEXWORD << current_address << ' ' << variable << '\n'; if (contains_key(address, variable)) { raise << "duplicate global '" << variable << "'\n" << end(); return; |