WIP: added basic db fallback outupt to disasm

diff --git a/src/main.c b/src/main.c
index 3386281c476c9682b60dc590b5a7c3ea3b9ff56b..fff1c6e785700ee54be9cf0c8688d7446872c2ee 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -20,7 +20,7 @@
 #define ULAS_VER "0.0.1"
 
 // args without value
-#define ULAS_OPTS "hvVpd"
+#define ULAS_OPTS "hvVpdA"
 
 // args with value
 #define ULAS_OPTS_ARG "o:l:s:i:w:a:"
@@ -46,6 +46,7 @@ void ulas_help(void) {
   ULAS_HELP("s=path", "Symbols file");
   ULAS_HELP("i=path", "Add include search path");
   ULAS_HELP("a=initial-address", "Initial starting address");
+  ULAS_HELP("A", "Print addresses in disassembler mode");
   ULAS_HELP("d", "Disassemble a file");
   ULAS_HELP("w=warning", "Toggle warnings: a=all, o=overflow");
 }
@@ -97,6 +98,9 @@ void ulas_getopt(int argc, char **argv, struct ulas_config *cfg) {
     case 'd':
       cfg->disas = 1;
       break;
+    case 'A':
+      cfg->print_addrs = 1;
+      break;
     case '?':
       break;
     default:

diff --git a/src/ulas.h b/src/ulas.h
index c0c01b180e97af1cd3c1845b0d176f61a7798c9b..fe29e7f09f5bd80d820d991f7110a2777f1307c4 100644 (file)
--- a/src/ulas.h
+++ b/src/ulas.h
@@ -134,6 +134,8 @@ struct ulas_config {
 
   unsigned int org;
 
+  unsigned int print_addrs;
+
   // all include search paths
   char **incpaths;
   unsigned int incpathslen;

diff --git a/src/uldas.c b/src/uldas.c
index 4e92ff25fc3997c3faedb36dbd82cb5a0b6c8960..c2339d4f92959eb83491c483fe298024d1b82e5d 100644 (file)
--- a/src/uldas.c
+++ b/src/uldas.c
@@ -8,7 +8,10 @@ void ulas_dasm_instr_fout(FILE *src, FILE *dst, const struct ulas_instr *instr,
     return;
   }
 
-  fprintf(dst, "%s ", instr->name);
+  if (ulascfg.print_addrs) {
+    fprintf(dst, "%08x ", ulas.address);
+  }
+  fprintf(dst, "  %s ", instr->name);
   int bi = 0;
   for (int i = 0; instr->tokens[i]; i++) {
     int dat = instr->tokens[i];
@@ -23,9 +26,9 @@ void ulas_dasm_instr_fout(FILE *src, FILE *dst, const struct ulas_instr *instr,
     default: {
       const char *reg = ulas_asmregstr(dat);
       if (reg) {
-      printf("%s", reg);
+        printf("%s", reg);
       } else {
-      printf("%c", dat);
+        printf("%c", dat);
       }
       break;
     }
@@ -35,6 +38,19 @@ void ulas_dasm_instr_fout(FILE *src, FILE *dst, const struct ulas_instr *instr,
   fprintf(dst, "\n");
 }
 
+// fallback if no instruction was found
+void ulas_dasm_db_fout(FILE *src, FILE *dst, const char *buf,
+                       unsigned long read) {
+  ulas.address++;
+  if (ulas.pass != ULAS_PASS_FINAL) {
+    return;
+  }
+  if (ulascfg.print_addrs) {
+    fprintf(dst, "%08x ", ulas.address);
+  }
+  fprintf(dst, ".db %x\n", buf[0] & 0xFF);
+}
+
 // returns > 1 if instruction was found, and 0 if not
 // the integer returned is the amount of bytes this instruction consumed
 int ulas_dasm_instr_check(FILE *src, FILE *dst, const struct ulas_instr *instr,
@@ -63,20 +79,22 @@ int ulas_dasm_instr_check(FILE *src, FILE *dst, const struct ulas_instr *instr,
     case ULAS_E16:
     case ULAS_A16:
       // need 2 bytes here
-      if (bi + 1 >= read) {
+      if (bi + 1 < read) {
         goto fail;
       }
       bi += 2;
       break;
     default:
-      if (buf[bi++] != dat) {
+      if (buf[bi] != dat) {
         goto fail;
       }
+      bi++;
       break;
     }
   }
 
   ulas_dasm_instr_fout(src, dst, instr, buf, read);
+  ulas.address += i;
   return i;
 fail:
   return 0;
@@ -115,6 +133,8 @@ int ulas_dasm_next(FILE *src, FILE *dst) {
     }
   }
 
+  ulas_dasm_db_fout(src, dst, buf, read);
+  fseek(src, srctell + 1, 0);
   return 1;
 }