mirror of
https://github.com/ksherlock/wdc-utils.git
synced 2024-12-30 13:29:18 +00:00
move bytes to comment column.
This commit is contained in:
Kelvin Sherlock
parent
82b90e95fd
commit
523c6a3dc6
262
disassembler.cpp
262
disassembler.cpp
@ -333,42 +333,92 @@ static constexpr const int modes[] =
|
||||
};
|
||||
|
||||
|
||||
static std::string to_x(uint32_t x, unsigned bytes, char prefix = 0) {
|
||||
std::string s;
|
||||
char buffer[16];
|
||||
if (prefix) s.push_back(prefix);
|
||||
|
||||
memset(buffer, '0', sizeof(buffer));
|
||||
int i = 16;
|
||||
while (x) {
|
||||
buffer[--i] = "0123456789abcdef"[x & 0x0f];
|
||||
x >>= 4;
|
||||
}
|
||||
|
||||
s.append(buffer + 16 - bytes, buffer + 16);
|
||||
|
||||
return s;
|
||||
}
|
||||
|
||||
|
||||
|
||||
void disassembler::reset() {
|
||||
_arg = 0;
|
||||
_st = 0;
|
||||
}
|
||||
|
||||
constexpr const int kOpcodeTab = 20;
|
||||
constexpr const int kOperandTab = 30;
|
||||
constexpr const int kCommentTab = 80;
|
||||
|
||||
void indent_to(std::string &line, unsigned position) {
|
||||
if (line.length() < position)
|
||||
line.resize(position, ' ');
|
||||
}
|
||||
|
||||
|
||||
void disassembler::dump() {
|
||||
|
||||
std::string line;
|
||||
|
||||
if (!_st) return;
|
||||
|
||||
hexdump();
|
||||
|
||||
printf("\tbyte\t");
|
||||
indent_to(line, kOpcodeTab);
|
||||
line += "db";
|
||||
indent_to(line, kOperandTab);
|
||||
|
||||
|
||||
for (unsigned i = 0; i < _st; ++i) {
|
||||
if (i > 0) printf(", ");
|
||||
printf("$%02x", _bytes[i]);
|
||||
if (i > 0) line += ", ";
|
||||
line += to_x(_bytes[i], 2, '$');
|
||||
}
|
||||
printf("\n");
|
||||
|
||||
hexdump(line);
|
||||
line.push_back('\n');
|
||||
fputs(line.c_str(), stdout);
|
||||
|
||||
_pc += _st;
|
||||
reset();
|
||||
}
|
||||
|
||||
void disassembler::dump(const std::string &expr, unsigned size) {
|
||||
|
||||
std::string line;
|
||||
|
||||
if (_st) dump();
|
||||
|
||||
for (_st = 0; _st < size; ++_st) _bytes[_st] = 0;
|
||||
|
||||
hexdump();
|
||||
indent_to(line, kOpcodeTab);
|
||||
|
||||
switch(size) {
|
||||
case 1: printf("\tbyte\t"); break;
|
||||
case 2: printf("\tword\t"); break;
|
||||
case 3: printf("\tda\t"); break;
|
||||
case 4: printf("\tlong\t"); break;
|
||||
default: printf("\t%d bytes\t", size);
|
||||
case 1: line += "db"; break;
|
||||
case 2: line += "dw"; break;
|
||||
case 3: line += "da"; break;
|
||||
case 4: line += "dl"; break;
|
||||
default:
|
||||
line += std::to_string(size);
|
||||
line += " bytes";
|
||||
break;
|
||||
}
|
||||
printf("%s\n", expr.c_str());
|
||||
indent_to(line, kOperandTab);
|
||||
line += expr;
|
||||
|
||||
hexdump(line);
|
||||
line.push_back('\n');
|
||||
fputs(line.c_str(), stdout);
|
||||
|
||||
_pc += _st;
|
||||
reset();
|
||||
}
|
||||
@ -378,8 +428,20 @@ void disassembler::flush() {
|
||||
}
|
||||
|
||||
|
||||
void disassembler::check_labels() {
|
||||
|
||||
if ( _label_callback && _next_label >= 0 && _pc + _st >= _next_label) {
|
||||
flush();
|
||||
_next_label = _label_callback(_pc);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
void disassembler::operator()(const std::string &expr, unsigned size) {
|
||||
|
||||
// todo -- what if label within size?
|
||||
check_labels();
|
||||
|
||||
if (!_code) {
|
||||
dump(expr, size);
|
||||
return;
|
||||
@ -397,6 +459,8 @@ void disassembler::operator()(const std::string &expr, unsigned size) {
|
||||
|
||||
void disassembler::operator()(uint8_t byte) {
|
||||
|
||||
check_labels();
|
||||
|
||||
if (!_code) {
|
||||
_bytes[_st++] = byte;
|
||||
if (_st == 4) dump();
|
||||
@ -455,6 +519,68 @@ void disassembler::print_prefix() {
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
std::string disassembler::prefix() {
|
||||
|
||||
std::string tmp;
|
||||
|
||||
switch(_mode & 0xf000) {
|
||||
case mImmediate: tmp = "#"; break;
|
||||
case mDP: tmp = "<"; break;
|
||||
case mDPI: tmp = "(<"; break;
|
||||
case mDPIL: tmp = "[<"; break;
|
||||
|
||||
case mRelative:
|
||||
case mBlockMove:
|
||||
break;
|
||||
|
||||
// cop, brk are treated as absolute.
|
||||
case mAbsolute:
|
||||
//if (_size == 1) printf("\t");
|
||||
if (_size > 1) tmp = "|";
|
||||
break;
|
||||
case mAbsoluteLong: tmp = ">"; break;
|
||||
case mAbsoluteI: tmp = "("; break;
|
||||
}
|
||||
return tmp;
|
||||
}
|
||||
|
||||
|
||||
|
||||
std::string disassembler::suffix() {
|
||||
|
||||
std::string tmp;
|
||||
|
||||
switch(_mode & 0x0f00) {
|
||||
case m_X: tmp = ",x"; break;
|
||||
case m_Y: if (!(_mode & (mDPI|mDPIL))) tmp = ",y"; break;
|
||||
case m_S:
|
||||
case m_S | m_Y:
|
||||
tmp = ",s"; break;
|
||||
}
|
||||
|
||||
switch(_mode & 0xf000) {
|
||||
case mAbsoluteI:
|
||||
case mDPI:
|
||||
tmp += ")"; break;
|
||||
case mAbsoluteIL:
|
||||
case mDPIL:
|
||||
tmp += "]"; break;
|
||||
}
|
||||
|
||||
// (xxx,s),y
|
||||
// (xxx),y
|
||||
// [xxx],y
|
||||
switch(_mode & 0x0f00) {
|
||||
case m_Y:
|
||||
if (_mode & (mDPI|mDPIL)) tmp += ",y"; break;
|
||||
case m_S | m_Y:
|
||||
tmp += ",y"; break;
|
||||
}
|
||||
return tmp;
|
||||
|
||||
}
|
||||
|
||||
void disassembler::print_suffix() {
|
||||
|
||||
switch(_mode & 0x0f00) {
|
||||
@ -485,6 +611,34 @@ void disassembler::print_suffix() {
|
||||
|
||||
}
|
||||
|
||||
|
||||
void disassembler::hexdump(std::string &line) {
|
||||
// print pc and hexdump...
|
||||
|
||||
indent_to(line, kCommentTab);
|
||||
line += "; ";
|
||||
|
||||
line += to_x(_pc, 4);
|
||||
line.push_back(':');
|
||||
|
||||
int i;
|
||||
for (i = 0; i < _st; ++i) {
|
||||
line.push_back(' ');
|
||||
line += to_x(_bytes[i], 2);
|
||||
}
|
||||
for ( ; i < 4; ++i) {
|
||||
line += " ";
|
||||
}
|
||||
line += " ";
|
||||
for (i = 0; i < _st; ++i) {
|
||||
uint8_t c = _bytes[i];
|
||||
if (isprint(c) && isascii(c)) line += c;
|
||||
else line += '.';
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
void disassembler::hexdump() {
|
||||
// print pc and hexdump...
|
||||
int i;
|
||||
@ -494,46 +648,86 @@ void disassembler::hexdump() {
|
||||
}
|
||||
for ( ; i < 4; ++i) {
|
||||
printf(" ");
|
||||
}
|
||||
}
|
||||
printf(" ");
|
||||
for (i = 0; i < _st; ++i) {
|
||||
uint8_t c = _bytes[i];
|
||||
if (isprint(c) && isascii(c)) putc(c, stdout);
|
||||
else putc('.', stdout);
|
||||
}
|
||||
for ( ; i < 4; ++i) {
|
||||
printf(" ");
|
||||
}
|
||||
}
|
||||
|
||||
void disassembler::print() {
|
||||
|
||||
hexdump();
|
||||
|
||||
printf("\t%.3s", &opcodes[_op * 3]);
|
||||
if (_size) {
|
||||
std::string tmp;
|
||||
|
||||
print_prefix();
|
||||
switch(_mode & 0xf000) {
|
||||
case mRelative: {
|
||||
|
||||
uint32_t pc = _pc + 1 + _size + _arg;
|
||||
|
||||
if ((_size == 1) && (_arg & 0x80))
|
||||
pc += 0xff00;
|
||||
pc &= 0xffff;
|
||||
tmp = to_x(pc, 4, '$');
|
||||
// it would be really fancy if it checked for a label name @pc...
|
||||
break;
|
||||
}
|
||||
case mBlockMove: {
|
||||
// todo -- verify order.
|
||||
tmp = to_x((_arg >> 0) & 0xff, 2, '$')
|
||||
+ ","
|
||||
+ to_x((_arg >> 8) & 0xff, 2, '$');
|
||||
break;
|
||||
}
|
||||
default: {
|
||||
tmp = to_x(_arg, _size * 2, '$');
|
||||
break;
|
||||
}
|
||||
}
|
||||
print(tmp);
|
||||
return;
|
||||
|
||||
// todo -- relative, block mode.
|
||||
switch (_size) {
|
||||
case 0: break;
|
||||
case 1: printf("$%02x", _arg); break;
|
||||
case 2: printf("$%04x", _arg); break;
|
||||
case 3: printf("$%06x", _arg); break;
|
||||
}
|
||||
|
||||
print_suffix();
|
||||
// also print bytes?
|
||||
printf("\n");
|
||||
std::string line;
|
||||
|
||||
indent_to(line, kOpcodeTab);
|
||||
line.append(&opcodes[_op * 3], 3);
|
||||
|
||||
|
||||
hexdump(line);
|
||||
line.push_back('\n');
|
||||
fputs(line.c_str(), stdout);
|
||||
_pc += _size + 1;
|
||||
reset();
|
||||
}
|
||||
|
||||
void disassembler::print(const std::string &expr) {
|
||||
|
||||
hexdump();
|
||||
|
||||
printf("\t%.3s", &opcodes[_op * 3]);
|
||||
std::string line;
|
||||
|
||||
print_prefix();
|
||||
indent_to(line, kOpcodeTab);
|
||||
line.append(&opcodes[_op * 3], 3);
|
||||
|
||||
// todo -- relative, block mode.
|
||||
printf("%s", expr.c_str());
|
||||
if (_size) {
|
||||
|
||||
indent_to(line, kOperandTab);
|
||||
line += prefix();
|
||||
line += expr;
|
||||
line += suffix();
|
||||
}
|
||||
|
||||
hexdump(line);
|
||||
line.push_back('\n');
|
||||
fputs(line.c_str(), stdout);
|
||||
|
||||
print_suffix();
|
||||
// also print bytes?
|
||||
printf("\n");
|
||||
_pc += _size + 1;
|
||||
reset();
|
||||
}
|
||||
}
|
||||
|
||||
@ -3,6 +3,7 @@
|
||||
|
||||
#include <stdint.h>
|
||||
#include <string>
|
||||
#include <functional>
|
||||
|
||||
class disassembler {
|
||||
|
||||
@ -41,6 +42,17 @@ class disassembler {
|
||||
void flush();
|
||||
|
||||
|
||||
void set_label_callback(std::function<int32_t(int32_t)> callback) {
|
||||
_label_callback = callback;
|
||||
_next_label = -1;
|
||||
if (_label_callback) _next_label = _label_callback(-1);
|
||||
}
|
||||
|
||||
void recalc_next_label() {
|
||||
if (_label_callback) _next_label = _label_callback(-1);
|
||||
else _next_label = -1;
|
||||
}
|
||||
|
||||
|
||||
private:
|
||||
|
||||
@ -55,7 +67,11 @@ class disassembler {
|
||||
void print_prefix();
|
||||
void print_suffix();
|
||||
|
||||
std::string prefix();
|
||||
std::string suffix();
|
||||
|
||||
void hexdump();
|
||||
void hexdump(std::string &);
|
||||
|
||||
unsigned _st = 0;
|
||||
uint8_t _op = 0;
|
||||
@ -67,6 +83,11 @@ class disassembler {
|
||||
unsigned _arg = 0;
|
||||
|
||||
bool _code = true;
|
||||
int32_t _next_label = -1;
|
||||
|
||||
void check_labels();
|
||||
|
||||
std::function<int32_t(int32_t)> _label_callback;
|
||||
};
|
||||
|
||||
#endif
|
||||
#endif
|
||||
|
||||
311
dumpobj.cpp
311
dumpobj.cpp
@ -156,7 +156,10 @@ struct section {
|
||||
uint8_t flags = 0;
|
||||
uint32_t size = 0;
|
||||
uint32_t org = 0;
|
||||
|
||||
// for disassembly tracking...
|
||||
uint32_t pc = 0;
|
||||
std::vector<symbol> symbols;
|
||||
};
|
||||
|
||||
std::vector<section> read_sections(const std::vector<uint8_t> §ion_data) {
|
||||
@ -237,6 +240,72 @@ void place_labels(std::vector<symbol> &labels, uint32_t pc) {
|
||||
}
|
||||
}
|
||||
|
||||
void emit(const std::string &label) {
|
||||
fputs(label.c_str(), stdout);
|
||||
//fputc(':', stdout); // special case.
|
||||
fputc('\n', stdout);
|
||||
}
|
||||
|
||||
void emit(const std::string &label, const std::string &opcode) {
|
||||
fputs(label.c_str(), stdout);
|
||||
|
||||
int column = label.length();
|
||||
|
||||
if (!opcode.empty()) {
|
||||
do {
|
||||
putc(' ', stdout);
|
||||
column++;
|
||||
} while (column < 20);
|
||||
fputs(opcode.c_str(), stdout);
|
||||
}
|
||||
fputc('\n', stdout);
|
||||
}
|
||||
|
||||
|
||||
|
||||
void emit(const std::string &label, const std::string &opcode, const std::string &operand) {
|
||||
fputs(label.c_str(), stdout);
|
||||
int column = label.length();
|
||||
|
||||
if (!opcode.empty()) {
|
||||
|
||||
do {
|
||||
putc(' ', stdout);
|
||||
column++;
|
||||
} while (column < 20);
|
||||
fputs(opcode.c_str(), stdout);
|
||||
column += opcode.length();
|
||||
}
|
||||
|
||||
if (!operand.empty()) {
|
||||
do {
|
||||
putc(' ', stdout);
|
||||
column++;
|
||||
} while (column < 30);
|
||||
fputs(operand.c_str(), stdout);
|
||||
column += operand.length();
|
||||
}
|
||||
fputc('\n', stdout);
|
||||
return;
|
||||
}
|
||||
|
||||
static std::string to_x(uint32_t x, unsigned bytes, char prefix = 0) {
|
||||
std::string s;
|
||||
char buffer[16];
|
||||
if (prefix) s.push_back(prefix);
|
||||
|
||||
memset(buffer, '0', sizeof(buffer));
|
||||
int i = 16;
|
||||
while (x) {
|
||||
buffer[--i] = "0123456789abcdef"[x & 0x0f];
|
||||
x >>= 4;
|
||||
}
|
||||
|
||||
s.append(buffer + 16 - bytes, buffer + 16);
|
||||
|
||||
return s;
|
||||
}
|
||||
|
||||
bool dump_obj(const char *name, int fd)
|
||||
{
|
||||
static const char *kSections[] = { "PAGE0", "CODE", "KDATA", "DATA", "UDATA" };
|
||||
@ -275,6 +344,7 @@ bool dump_obj(const char *name, int fd)
|
||||
if (ok != h.h_namlen) errx(EX_DATAERR, "%s", name);
|
||||
|
||||
|
||||
/*
|
||||
printf("name: %s\n", oname.data());
|
||||
printf("record size : $%04x\n", h.h_recsize);
|
||||
printf("section size : $%04x\n", h.h_secsize);
|
||||
@ -282,6 +352,7 @@ bool dump_obj(const char *name, int fd)
|
||||
printf("option size : $%04x\n", h.h_optsize);
|
||||
printf("number sections: $%04x\n", h.h_num_secs);
|
||||
printf("number symbols : $%04x\n", h.h_num_syms);
|
||||
*/
|
||||
|
||||
// records [until record_eof]
|
||||
|
||||
@ -316,15 +387,90 @@ bool dump_obj(const char *name, int fd)
|
||||
for (int i = 0; i < 5; ++i)
|
||||
if (sections[i].name.empty()) sections[i].name = kSections[i];
|
||||
|
||||
|
||||
/* custom sections... */
|
||||
if (sections.size() >= 5) {
|
||||
|
||||
printf("\n");
|
||||
for (auto iter = sections.begin() + 5; iter != sections.end(); ++iter) {
|
||||
std::string attr;
|
||||
|
||||
bool comma = false;
|
||||
int flags = iter->flags;
|
||||
if (flags & SEC_OFFSET) {
|
||||
if (comma) attr += ", ";
|
||||
attr += "SEC_OFFSET $";
|
||||
attr += to_x(iter->org, 4);
|
||||
comma = true;
|
||||
}
|
||||
if (flags & SEC_INDIRECT) {
|
||||
if (comma) attr += ", ";
|
||||
attr += "SEC_INDIRECT $";
|
||||
attr += to_x(iter->org, 4);
|
||||
comma = true;
|
||||
}
|
||||
#define _(x) if (flags & x) { if (comma) attr += ", "; attr += #x; comma = true; }
|
||||
_(SEC_STACKED)
|
||||
_(SEC_REF_ONLY)
|
||||
_(SEC_CONST)
|
||||
_(SEC_DIRECT)
|
||||
_(SEC_NONAME)
|
||||
_(SEC_DATA)
|
||||
#undef _
|
||||
|
||||
emit(iter->name, "section", attr);
|
||||
}
|
||||
printf("\n");
|
||||
}
|
||||
|
||||
|
||||
emit("", "MODULE", std::string(oname.data()));
|
||||
emit("", "CODE", "; section 1");
|
||||
d.set_pc(0);
|
||||
d.set_code(true);
|
||||
|
||||
std::vector<symbol> labels = labels_for_section(symbols, section);
|
||||
|
||||
for (auto &s : symbols) {
|
||||
if (s.type == S_UND) continue;
|
||||
sections[s.section].symbols.push_back(s);
|
||||
}
|
||||
for (auto §ion : sections) {
|
||||
std::sort(section.symbols.begin(), section.symbols.end(), [](const symbol &a, const symbol &b){
|
||||
return a.offset > b.offset;
|
||||
});
|
||||
}
|
||||
|
||||
d.set_label_callback([§ion, §ions](int32_t offset) -> int32_t {
|
||||
auto &symbols = sections[section].symbols;
|
||||
|
||||
if (offset >= 0) {
|
||||
|
||||
while(!symbols.empty()) {
|
||||
auto &s = symbols.back();
|
||||
if (s.offset > offset) return s.offset;
|
||||
if (s.offset == offset) {
|
||||
emit(s.name);
|
||||
} else {
|
||||
std::string tmp = "; ";
|
||||
tmp += s.name;
|
||||
tmp += " = $";
|
||||
tmp += to_x(s.offset, 4);
|
||||
emit("", tmp);
|
||||
}
|
||||
symbols.pop_back();
|
||||
continue;
|
||||
}
|
||||
}
|
||||
if (symbols.empty()) return -1;
|
||||
return symbols.back().offset;
|
||||
});
|
||||
|
||||
//std::vector<symbol> labels = labels_for_section(symbols, section);
|
||||
|
||||
auto iter = data.begin();
|
||||
while (iter != data.end()) {
|
||||
|
||||
place_labels(labels, d.pc());
|
||||
//place_labels(labels, d.pc());
|
||||
|
||||
op = read_8(iter);
|
||||
if (op == 0) break;
|
||||
@ -332,7 +478,7 @@ bool dump_obj(const char *name, int fd)
|
||||
auto end = iter + op;
|
||||
while (iter != end) {
|
||||
d(*iter++);
|
||||
place_labels(labels, d.pc());
|
||||
//place_labels(labels, d.pc());
|
||||
}
|
||||
continue;
|
||||
}
|
||||
@ -473,51 +619,56 @@ bool dump_obj(const char *name, int fd)
|
||||
switch(op) {
|
||||
case D_LONGA_ON:
|
||||
d.set_m(true);
|
||||
printf("\tlonga\ton\n");
|
||||
emit("", "longa", "on");
|
||||
break;
|
||||
case D_LONGA_OFF:
|
||||
d.set_m(false);
|
||||
printf("\tlonga\toff\n");
|
||||
emit("", "longa", "off");
|
||||
break;
|
||||
case D_LONGI_ON:
|
||||
d.set_x(true);
|
||||
printf("\tlongi\ton\n");
|
||||
emit("", "longi", "on");
|
||||
break;
|
||||
case D_LONGI_OFF:
|
||||
d.set_x(false);
|
||||
printf("\tlongi\toff\n");
|
||||
emit("", "longi", "off");
|
||||
break;
|
||||
case D_C_FILE: {
|
||||
file = read_cstring(iter);
|
||||
line = read_16(iter);
|
||||
printf("\t.file\t\"%s\", %d\n", file.c_str(), line);
|
||||
std::string tmp = file + ", " + std::to_string(line);
|
||||
emit("", ".file", tmp);
|
||||
break;
|
||||
}
|
||||
case D_C_LINE: {
|
||||
line = read_16(iter);
|
||||
printf("\t.line\t%d\n", line);
|
||||
emit("",".line", std::to_string(line));
|
||||
break;
|
||||
}
|
||||
case D_C_BLOCK: {
|
||||
uint16_t block = read_16(iter);
|
||||
printf("\t.block\t%d\n", block);
|
||||
emit("",".block", std::to_string(line));
|
||||
break;
|
||||
}
|
||||
case D_C_ENDBLOCK: {
|
||||
uint16_t line = read_16(iter);
|
||||
printf("\t.endblock\t%d\n", line);
|
||||
emit("",".endblock", std::to_string(line));
|
||||
break;
|
||||
}
|
||||
case D_C_FUNC: {
|
||||
uint16_t arg = read_16(iter);
|
||||
printf("\t.function\t%d\n", arg);
|
||||
emit("",".function", std::to_string(line));
|
||||
break;
|
||||
}
|
||||
case D_C_ENDFUNC: {
|
||||
uint16_t line = read_16(iter);
|
||||
uint16_t local_offset = read_16(iter);
|
||||
uint16_t arg_offset = read_16(iter);
|
||||
printf("\t.endfunc\t%d, %d, %d\n", line, local_offset, arg_offset);
|
||||
std::string tmp;
|
||||
tmp = std::to_string(line) + ", "
|
||||
+ std::to_string(local_offset) + ", "
|
||||
+ std::to_string(arg_offset);
|
||||
emit("",".endfunc", tmp);
|
||||
break;
|
||||
}
|
||||
|
||||
@ -531,11 +682,14 @@ bool dump_obj(const char *name, int fd)
|
||||
std::string name = read_cstring(iter);
|
||||
uint16_t size = read_16(iter);
|
||||
uint16_t tag = read_16(iter);
|
||||
printf("\t.%s\t%s, %d, %d\n", opname, name.c_str(), size, tag);
|
||||
|
||||
std::string tmp;
|
||||
tmp = name + ", " + std::to_string(size) + ", " + std::to_string(tag);
|
||||
emit("", opname, tmp);
|
||||
break;
|
||||
}
|
||||
case D_C_EOS: {
|
||||
printf("\t.eos\n");
|
||||
emit("", ".eos");
|
||||
break;
|
||||
}
|
||||
|
||||
@ -555,18 +709,26 @@ bool dump_obj(const char *name, int fd)
|
||||
|
||||
const char *opname = ".sym";
|
||||
if (op == D_C_MEMBER) opname = ".member";
|
||||
|
||||
|
||||
std::string attr;
|
||||
|
||||
if (version == 0) {
|
||||
std::string svalue;
|
||||
svalue = symbols[value].name;
|
||||
printf("\t%s\t%s, %s, %d, %d, %d",
|
||||
opname, name.c_str(), svalue.c_str(), type, klass, size);
|
||||
|
||||
attr = name + ", " + svalue;
|
||||
}
|
||||
|
||||
if (version == 1)
|
||||
printf("\t%s\t%s, %d, %d, %d, %d",
|
||||
opname, name.c_str(), value, type, klass, size);
|
||||
if (version == 1) {
|
||||
attr = name + ", " + std::to_string(value);
|
||||
}
|
||||
|
||||
attr += ", " + std::to_string(type);
|
||||
attr += ", " + std::to_string(klass);
|
||||
attr += ", " + std::to_string(size);
|
||||
|
||||
|
||||
// it's a little more complicated than this, I believe...
|
||||
/*
|
||||
* type bits 1 ... 5 are T_xxxx
|
||||
* then 3 bits of DT_xxx (repeatedly)
|
||||
@ -576,7 +738,7 @@ bool dump_obj(const char *name, int fd)
|
||||
int t = type & 0x1f;
|
||||
if ((t == T_STRUCT) || (t == T_UNION)) {
|
||||
uint16_t tag = read_16(iter);
|
||||
printf(", %d", tag);
|
||||
attr += ", " + std::to_string(tag);
|
||||
}
|
||||
|
||||
// need to do it until t == 0 for
|
||||
@ -584,12 +746,13 @@ bool dump_obj(const char *name, int fd)
|
||||
for ( t = type >> 5; t; t >>= 3) {
|
||||
if ((t & 0x07) == DT_ARY) {
|
||||
uint16_t dim = read_16(iter);
|
||||
printf(", %d", dim);
|
||||
attr += ", " + std::to_string(dim);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
printf("\n");
|
||||
emit("", opname, attr);
|
||||
|
||||
break;
|
||||
}
|
||||
|
||||
@ -605,13 +768,23 @@ bool dump_obj(const char *name, int fd)
|
||||
case REC_SECT: {
|
||||
d.flush();
|
||||
uint8_t sec = read_8(iter);
|
||||
printf("\t.sect\t%d\n", sec);
|
||||
//printf("\t.sect\t%d\n", sec);
|
||||
if (sec != section) {
|
||||
|
||||
if (sec >= sections.size()) {
|
||||
warnx("Undefined section %d", sec);
|
||||
}
|
||||
|
||||
const auto &s = sections[sec];
|
||||
emit("", "ends", std::string("; end section ") + std::to_string(section));
|
||||
printf("\n");
|
||||
emit("", s.name, std::string("; section ") + std::to_string(sec));
|
||||
|
||||
sections[section].pc = d.pc();
|
||||
section = sec;
|
||||
d.set_pc(sections[section].pc);
|
||||
labels = labels_for_section(symbols, section);
|
||||
d.set_code((sections[sec].flags & SEC_DATA) == 0);
|
||||
d.set_pc(s.pc);
|
||||
d.recalc_next_label();
|
||||
d.set_code((s.flags & SEC_DATA) == 0);
|
||||
}
|
||||
break;
|
||||
}
|
||||
@ -619,7 +792,7 @@ bool dump_obj(const char *name, int fd)
|
||||
case REC_ORG: {
|
||||
d.flush();
|
||||
uint32_t org = read_32(iter);
|
||||
printf("\t.org\t$%04x\n", org);
|
||||
emit("", ".org", to_x(org, 4, '$'));
|
||||
d.set_pc(org);
|
||||
break;
|
||||
}
|
||||
@ -627,7 +800,8 @@ bool dump_obj(const char *name, int fd)
|
||||
case REC_SPACE: {
|
||||
d.flush();
|
||||
uint16_t count = read_16(iter);
|
||||
printf("\tds\t$%04x\n", count);
|
||||
// todo -- need to coordinate with label printer/disassembler.
|
||||
emit("", "ds", to_x(count, 4, '$'));
|
||||
d.set_pc(d.pc() + count);
|
||||
break;
|
||||
}
|
||||
@ -643,80 +817,23 @@ bool dump_obj(const char *name, int fd)
|
||||
errx(EX_DATAERR, "%s: unknown opcode %02x", name, op);
|
||||
}
|
||||
}
|
||||
// dump any unfinished business.
|
||||
d.flush();
|
||||
|
||||
place_labels(labels, d.pc());
|
||||
|
||||
|
||||
//place_labels(labels, d.pc());
|
||||
/*
|
||||
for(auto &label : labels) {
|
||||
warnx("Unable to place label %s (offset $%04x)", label.name.c_str(), label.offset);
|
||||
}
|
||||
|
||||
|
||||
*/
|
||||
emit("", "ends");
|
||||
printf("\n");
|
||||
emit("", "endmod");
|
||||
printf("\n");
|
||||
|
||||
if (iter != data.end() || op != REC_END) errx(EX_DATAERR, "%s records ended early", name);
|
||||
|
||||
|
||||
// section info
|
||||
|
||||
printf("\nSections\n");
|
||||
|
||||
for(const auto &s : sections) {
|
||||
if (s.size) {
|
||||
|
||||
printf("section %d\n", s.number);
|
||||
if (!(s.flags & SEC_NONAME))
|
||||
printf("name: %s\n", s.name.c_str());
|
||||
printf("flags: %02x ", s.flags);
|
||||
|
||||
#undef _
|
||||
#define _(x) if (s.flags & x) fputs(#x " ", stdout)
|
||||
_(SEC_OFFSET);
|
||||
_(SEC_INDIRECT);
|
||||
_(SEC_STACKED);
|
||||
_(SEC_REF_ONLY);
|
||||
_(SEC_CONST);
|
||||
_(SEC_DIRECT);
|
||||
_(SEC_NONAME);
|
||||
_(SEC_DATA);
|
||||
fputs("\n", stdout);
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
// symbol info
|
||||
#if 0
|
||||
printf("\nSymbols\n");
|
||||
|
||||
iter = symbol_data.begin();
|
||||
while (iter != symbol_data.end()) {
|
||||
uint8_t type = read_8(iter);
|
||||
uint8_t flags = read_8(iter);
|
||||
uint8_t section = read_8(iter);
|
||||
uint32_t offset = type == S_UND ? 0 : read_32(iter);
|
||||
std::string name = read_cstring(iter);
|
||||
|
||||
printf("name : %s\n", name.c_str());
|
||||
printf("type : $%02x %s\n", type, type < sizeof(kTypes) / sizeof(kTypes[0]) ? kTypes[type] : "");
|
||||
printf("flags: $%02x ", flags);
|
||||
#undef _
|
||||
#define _(x) if (flags & x) fputs(#x " ", stdout)
|
||||
_(SF_GBL);
|
||||
_(SF_DEF);
|
||||
_(SF_REF);
|
||||
_(SF_VAR);
|
||||
_(SF_PG0);
|
||||
_(SF_TMP);
|
||||
_(SF_DEF2);
|
||||
_(SF_LIB);
|
||||
fputs("\n", stdout);
|
||||
printf("section: %02x %s\n", section,
|
||||
section < sizeof(sections) / sizeof(sections[0]) ? sections[section] : "");
|
||||
if (type != S_UND)
|
||||
printf("offset: %04x\n", offset);
|
||||
|
||||
}
|
||||
#endif
|
||||
return true;
|
||||
}
|
||||
|
||||
@ -829,4 +946,4 @@ int main(int argc, char **argv) {
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user