提交: 6a5659c85194e76ee15b1da179a1467c00f58a2a - motonesas (git)

MOT6502 assembler, disassembler and linker

Commit MetaInfo

• 修订版: 6a5659c85194e76ee15b1da179a1467c00f58a2a (tree)
• 时间: 2013-02-16 13:41:02
• 作者: astoria-d <astoria-d@mail...>
• Commiter: astoria-d

Log Message

branch instruction bug fix

更改概述

• modified: assembler/6502inst.c
• modified: assembler/nesas-main.c
• modified: assembler/nesas.y
• modified: assembler/segment.c

差异

--- a/assembler/6502inst.c
+++ b/assembler/6502inst.c
@@ -90,7 +90,7 @@ static int inst_tbl_init(void) {
 }
 
 static void inst_tbl_free(void) {
-    dprint ("inst_tbl_free.\n");
+    //dprint ("inst_tbl_free.\n");
 
     int index = 0;
 
@@ -397,7 +397,7 @@ void write_str(const char* str) {
     //dprint("write_str:%s\n", str);
     int len = strlen(str) + 1;
     FILE* fp = get_current_file();
-    char* p = str;
+    const char* p = str;
     while (len-- > 0)
         fwrite(str++, 1, 1, fp);
     deb_print_str(p);
@@ -443,6 +443,22 @@ void deb_print_nl(void) {
 #endif /*DEB_PRINT*/
 }
 
+int is_branch_inst(const char* mnemonic) {
+    if (!strcasecmp(mnemonic, "BPL") ||
+        !strcasecmp(mnemonic, "BMI") ||
+        !strcasecmp(mnemonic, "BVC") ||
+        !strcasecmp(mnemonic, "BVS") ||
+        !strcasecmp(mnemonic, "BCC") ||
+        !strcasecmp(mnemonic, "BCS") ||
+        !strcasecmp(mnemonic, "BNE") ||
+        !strcasecmp(mnemonic, "BEQ") 
+        ) {
+        return TRUE;
+    }
+    else
+        return FALSE;
+}
+
 
 int inst_encode_init() {
     inst_tbl_init(); 

--- a/assembler/nesas-main.c
+++ b/assembler/nesas-main.c
@@ -121,6 +121,8 @@ int main (int argc, char** argv) {
         return RT_ERROR;
     }
 
+    printf("assemble succeeded.\n");
+
 done:
 
     if (need_close)

--- a/assembler/nesas.y
+++ b/assembler/nesas.y
@@ -16,6 +16,7 @@ int dir_data_size = 0;
 
 void add_unresolved_ref(const char* symbol);
 int get_abs_addr(unsigned short abs_addr);
+int is_branch_inst(const char* mnemonic);
 
 #if 1
 #define dprint(...)    
@@ -318,7 +319,12 @@ inst_param
         }
         else {
             add_unresolved_ref($<str>1);
-            num = 0xFFFF;
+
+            ///branch instruction has 1 byte operand
+            if (is_branch_inst(cur_inst) )
+                num = 0xFF;
+            else
+                num = 0xFFFF;
         }
 
         if (!write_inst(cur_inst, PARAM_NUM, num)) {

--- a/assembler/segment.c
+++ b/assembler/segment.c
@@ -94,8 +94,11 @@ int addr_lookup(const char* symbol, unsigned short* return_addr) {
         struct symmap* pp = psym;
 
         if (!strcmp(symbol, psym->symbol)) {
+            /*
             dprint("addr_lookup %s found %04x, current:%08x\n", psym->symbol, 
                     psym->addr, get_current_pc());
+            */
+
             found = TRUE;
             *return_addr = psym->addr;
             break;
@@ -198,7 +201,7 @@ unsigned short get_current_pc(void) {
 static void clear_seglist(struct seginfo* sg_head) {
     struct seginfo* pseg;
 
-    dprint("clear_seglist.\n");
+    //dprint("clear_seglist.\n");
     pseg = sg_head;
     while (pseg != NULL) {
         struct seginfo* pp = pseg;
@@ -263,8 +266,10 @@ int finalize_segment(void) {
                         return FALSE;
                     }
                     addr = get_abs_addr(addr);
+                    /*
                     dprint("symbol ref at %04x to %s resolved, %04x.\n", 
-                            unres->addr, unres->symbol, addr);/**/
+                            unres->addr, unres->symbol, addr);
+                    */
                     fseek(fp, unres->addr, SEEK_SET);
                     fwrite(&addr, 2, 1, fp);
                 }