Added header for disas files

diff --git a/src/uldas.c b/src/uldas.c
index cecb44b9896cefdf4d9e1674c4ddfe4eaaa03034..c6154329064599c178bc7b75f2ee519ceffb986f 100644 (file)
--- a/src/uldas.c
+++ b/src/uldas.c
@@ -1,11 +1,20 @@
 #include "uldas.h"
 
+
 void ulas_dasm_print_addr(FILE *dst) {
   if (ulascfg.print_addrs) {
     fprintf(dst, "%08x ", ulas.address);
   }
 }
 
+void ulas_dasm_print_header(FILE *dst) {
+  if (ulas.pass != ULAS_PASS_FINAL) {
+    return;
+  }
+  ulas_dasm_print_addr(dst);
+  fprintf(dst, ".org 0x%x\n", ulas.address);
+}
+
 // this function assumes the bounds checks
 // for buf have already been done and will not check anymore!
 void ulas_dasm_instr_fout(FILE *src, FILE *dst, const struct ulas_instr *instr,
@@ -34,7 +43,7 @@ void ulas_dasm_instr_fout(FILE *src, FILE *dst, const struct ulas_instr *instr,
         val = (short)buf[bi] | (short)(buf[bi + 1] << 8);
       }
       bi += 2;
-      fprintf(dst, "0x%x", val);
+      fprintf(dst, "0x%x", val & 0xFFFF);
       break;
     }
     default: {
@@ -160,6 +169,8 @@ int ulas_dasm(FILE *src, FILE *dst) {
   // pass 1: run and collect labels
   // pass 2: run and output to file
 
+  ulas_dasm_print_header(dst);
+
   int rc = 0;
   while ((rc = ulas_dasm_next(src, dst)) > 0) {
     if (rc == -1) {