6502/wdc-utils
1
0
Fork 0
mirror of https://github.com/ksherlock/wdc-utils.git synced 2024-12-12 19:30:38 +00:00
Code Issues Projects Releases Wiki Activity

variable support.

Browse Source
This commit is contained in:
Kelvin Sherlock 2017-01-05 20:38:00 -05:00
parent 84119603be
commit 82ba6ef67d
2 changed files with 32 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
zrdz_disassembler.cpp
View File

@ -31,6 +31,7 @@ zrdz_disassembler::zrdz_disassembler(std::vector<section> &&sections, std::vecto
for (auto &s : _symbols) { for (auto &s : _symbols) {
if (s.type == S_UND) continue; if (s.type == S_UND) continue;
if (s.flags & SF_VAR) continue;
if (s.section >= _sections.size()) { if (s.section >= _sections.size()) {
warnx("invalid section %d for symbol %s", s.section, s.name.c_str()); warnx("invalid section %d for symbol %s", s.section, s.name.c_str());
@ -81,6 +82,7 @@ void zrdz_disassembler::front_matter(const std::string &module) {
emit("", "module", module); emit("", "module", module);
putchar('\n'); putchar('\n');
print_externs(); print_externs();
print_variables();
// reference-only sections. // reference-only sections.
for (auto &e : _sections) { for (auto &e : _sections) {
@ -175,8 +177,6 @@ void zrdz_disassembler::back_matter(unsigned flags) {
void zrdz_disassembler::print_externs() { void zrdz_disassembler::print_externs() {
std::vector<std::string> tmp; std::vector<std::string> tmp;
for (auto &s : _symbols) { for (auto &s : _symbols) {
@ -190,6 +190,34 @@ void zrdz_disassembler::print_externs() {
} }
// for sorting symbols by name.
bool operator<(const symbol &a, const symbol &b) {
return a.name < b.name;
}
void zrdz_disassembler::print_variables() {
std::vector<symbol> tmp;
for (auto &s : _symbols) {
if (s.flags & SF_VAR) tmp.push_back(s);
}
if (tmp.empty()) return;
std::sort(tmp.begin(), tmp.end());
for (const auto &s : tmp) {
if (s.flags & SF_GBL) emit("", "public", s.name);
emit(s.name, "var", to_x(s.offset, 4, '$'));
}
putchar('\n');
}
void zrdz_disassembler::print_globals(int section) { void zrdz_disassembler::print_globals(int section) {
std::vector<std::string> tmp; std::vector<std::string> tmp;
@ -213,9 +241,7 @@ void zrdz_disassembler::print_equs(int section) {
); );
if (tmp.empty()) return; if (tmp.empty()) return;
std::sort(tmp.begin(), tmp.end(), std::sort(tmp.begin(), tmp.end());
[](const symbol &a, const symbol &b) { return a.name < b.name; }
);
for (const auto &s : tmp) emit(s.name, "gequ", to_x(s.offset, 4, '$')); for (const auto &s : tmp) emit(s.name, "gequ", to_x(s.offset, 4, '$'));
putchar('\n'); putchar('\n');

1
zrdz_disassembler.h
View File

@ -65,6 +65,7 @@ private:
void print_section(const entry &e); void print_section(const entry &e);
void print_externs(); void print_externs();
void print_variables();
void print_globals(int section); void print_globals(int section);
void print_equs(int section); void print_equs(int section);