diff options
| author | Astrid Smith | 2011-06-26 02:48:40 -0700 |
|---|---|---|
| committer | Astrid Smith | 2011-06-26 02:48:40 -0700 |
| commit | 05fa34cf242f74614028a637908af943b7cff575 (patch) | |
| tree | 2d4097a9c40ed844e1e1f5026c8b40bd50130b1e | |
| parent | f6ebaf29e8b1a545dc2168426fea15cfb9593c83 (diff) | |
Resolved potential ambiguity in OP_* macros
| -rw-r--r-- | opcodes.asm.m4 | 2 | ||||
| -rw-r--r-- | opcodes.inc.m4 | 30 |
2 files changed, 7 insertions, 25 deletions
diff --git a/opcodes.asm.m4 b/opcodes.asm.m4 index 64fed19..99ead9d 100644 --- a/opcodes.asm.m4 +++ b/opcodes.asm.m4 @@ -234,7 +234,7 @@ OP_CB(00,«») ;; OP_DDCB(00,«») - ;; RLC + ;; OP_FD(00,«») ;; diff --git a/opcodes.inc.m4 b/opcodes.inc.m4 index 8757bb1..80a9064 100644 --- a/opcodes.inc.m4 +++ b/opcodes.inc.m4 @@ -23,10 +23,7 @@ undefine(«label»)dnl DONE»)dnl dnl define(«OP_DD»,« START_DD -dnl # This little bit of trickery lets me define a local label. -dnl # Calling local(end) inside of OPCODE(10, ...) will expand to -dnl # end_10, and is undefined everywhere else. -define(«local»,$«»1_««$1»»)dnl +define(«local»,$«»1_dd««$1»»)dnl «emu_op_dd»$1«:» $2 TIME $3 ifelse(«,$4», «,», «», «,$4») @@ -34,10 +31,7 @@ undefine(«label»)dnl DONE»)dnl dnl define(«OP_CB»,« START_CB -dnl # This little bit of trickery lets me define a local label. -dnl # Calling local(end) inside of OPCODE(10, ...) will expand to -dnl # end_10, and is undefined everywhere else. -define(«local»,$«»1_««$1»»)dnl +define(«local»,$«»1_cb««$1»»)dnl «emu_op_cb»$1«:» $2 TIME $3 ifelse(«,$4», «,», «», «,$4») @@ -45,10 +39,7 @@ undefine(«label»)dnl DONE»)dnl dnl define(«OP_DDCB»,« START_DDCB -dnl # This little bit of trickery lets me define a local label. -dnl # Calling local(end) inside of OPCODE(10, ...) will expand to -dnl # end_10, and is undefined everywhere else. -define(«local»,$«»1_««$1»»)dnl +define(«local»,$«»1_ddcb««$1»»)dnl «emu_op_ddcb»$1«:» $2 TIME $3 ifelse(«,$4», «,», «», «,$4») @@ -56,10 +47,7 @@ undefine(«label»)dnl DONE»)dnl dnl define(«OP_FD»,« START_FD -dnl # This little bit of trickery lets me define a local label. -dnl # Calling local(end) inside of OPCODE(10, ...) will expand to -dnl # end_10, and is undefined everywhere else. -define(«local»,$«»1_««$1»»)dnl +define(«local»,$«»1_fd««$1»»)dnl «emu_op_fd»$1«:» $2 TIME $3 ifelse(«,$4», «,», «», «,$4») @@ -67,10 +55,7 @@ undefine(«label»)dnl DONE»)dnl dnl define(«OP_FDCB»,« START_FDCB -dnl # This little bit of trickery lets me define a local label. -dnl # Calling local(end) inside of OPCODE(10, ...) will expand to -dnl # end_10, and is undefined everywhere else. -define(«local»,$«»1_««$1»»)dnl +define(«local»,$«»1_fdcb««$1»»)dnl «emu_op_fdcb»$1«:» $2 TIME $3 ifelse(«,$4», «,», «», «,$4») @@ -78,10 +63,7 @@ undefine(«label»)dnl DONE»)dnl dnl define(«OP_ED»,« START_ED -dnl # This little bit of trickery lets me define a local label. -dnl # Calling local(end) inside of OPCODE(10, ...) will expand to -dnl # end_10, and is undefined everywhere else. -define(«local»,$«»1_««$1»»)dnl +define(«local»,$«»1_ed««$1»»)dnl «emu_op_ed»$1«:» $2 TIME $3 ifelse(«,$4», «,», «», «,$4») |