Browse Source

Support ports in update script; implement EX/IM/IN.

master
Ben Kurtovic 8 years ago
parent
commit
b5459549b0
3 changed files with 142 additions and 19 deletions
  1. +9
    -8
      scripts/update_asm_instructions.py
  2. +83
    -1
      src/assembler/instructions.inc.c
  3. +50
    -10
      src/assembler/instructions.yml

+ 9
- 8
scripts/update_asm_instructions.py View File

@@ -159,12 +159,8 @@ class Instruction(object):
"""
Return an expression to check for a particular port value.
"""
if cond.startswith("reg."):
test1 = "INST_PORT({0}).type == AT_REGISTER".format(num)
test2 = "INST_PORT({0}).port.reg == REG_{1}".format(
num, cond[len("reg."):].upper())
return "({0} && {1})".format(test1, test2)

if cond == "reg" or cond == "reg.c":
return "INST_PORT({0}).type == AT_REGISTER".format(num)
if cond == "imm" or cond == "immediate":
return "INST_PORT({0}).type == AT_IMMEDIATE".format(num)

@@ -227,8 +223,13 @@ class Instruction(object):
for i, byte in enumerate(ret):
if not isinstance(byte, int):
if byte == "u8":
index = types.index("immediate")
ret[i] = "INST_IMM({0}).uval".format(index)
try:
index = types.index("immediate")
imm = "INST_IMM({0})".format(index)
except ValueError:
index = types.index("port")
imm = "INST_PORT({0}).port.imm".format(index)
ret[i] = imm + ".uval"

elif byte == "u16":
if i < len(ret) - 1:


+ 83
- 1
src/assembler/instructions.inc.c View File

@@ -7,7 +7,7 @@
`make` should trigger a rebuild when it is modified; if not, use:
`python scripts/update_asm_instructions.py`.

@AUTOGEN_DATE Tue May 19 06:49:06 2015 UTC
@AUTOGEN_DATE Tue May 19 07:10:15 2015 UTC
*/

/* @AUTOGEN_INST_BLOCK_START */
@@ -561,6 +561,32 @@ INST_FUNC(ei)
INST_RETURN(1, 0xFB)
}

INST_FUNC(ex)
{
INST_TAKES_ARGS(
AT_INDIRECT|AT_REGISTER,
AT_REGISTER,
AT_NONE
)
if (INST_TYPE(0) == AT_REGISTER && INST_TYPE(1) == AT_REGISTER) {
if (INST_REG(0) == REG_AF && INST_REG(1) == REG_AF_)
INST_RETURN(1, 0x08)
if (INST_REG(0) == REG_DE && INST_REG(1) == REG_HL)
INST_RETURN(1, 0xEB)
INST_ERROR(ARG_VALUE)
}
if (INST_TYPE(0) == AT_INDIRECT && INST_TYPE(1) == AT_REGISTER) {
if ((INST_INDIRECT(0).type == AT_REGISTER && INST_INDIRECT(0).addr.reg == REG_SP) && INST_REG(1) == REG_HL)
INST_RETURN(1, 0xE3)
if ((INST_INDIRECT(0).type == AT_REGISTER && INST_INDIRECT(0).addr.reg == REG_SP) && INST_REG(1) == REG_IX)
INST_RETURN(2, INST_IX_PREFIX, 0xE3)
if ((INST_INDIRECT(0).type == AT_REGISTER && INST_INDIRECT(0).addr.reg == REG_SP) && INST_REG(1) == REG_IY)
INST_RETURN(2, INST_IY_PREFIX, 0xE3)
INST_ERROR(ARG_VALUE)
}
INST_ERROR(ARG_TYPE)
}

INST_FUNC(exx)
{
INST_TAKES_NO_ARGS
@@ -573,6 +599,59 @@ INST_FUNC(halt)
INST_RETURN(1, 0x76)
}

INST_FUNC(im)
{
INST_TAKES_ARGS(
AT_IMMEDIATE,
AT_NONE,
AT_NONE
)
if (INST_TYPE(0) == AT_IMMEDIATE) {
if ((INST_IMM(0).mask & IMM_IM && INST_IMM(0).uval == 0))
INST_RETURN(2, 0xED, 0x46)
if ((INST_IMM(0).mask & IMM_IM && INST_IMM(0).uval == 1))
INST_RETURN(2, 0xED, 0x56)
if ((INST_IMM(0).mask & IMM_IM && INST_IMM(0).uval == 2))
INST_RETURN(2, 0xED, 0x5E)
INST_ERROR(ARG_VALUE)
}
INST_ERROR(ARG_TYPE)
}

INST_FUNC(in)
{
INST_TAKES_ARGS(
AT_PORT|AT_REGISTER,
AT_OPTIONAL|AT_PORT,
AT_NONE
)
if (INST_NARGS == 2 && INST_TYPE(0) == AT_REGISTER && INST_TYPE(1) == AT_PORT) {
if (INST_REG(0) == REG_A && INST_PORT(1).type == AT_IMMEDIATE)
INST_RETURN(2, 0xDB, INST_PORT(1).port.imm.uval)
if (INST_REG(0) == REG_A && INST_PORT(1).type == AT_REGISTER)
INST_RETURN(2, 0xED, 0x78)
if (INST_REG(0) == REG_B && INST_PORT(1).type == AT_REGISTER)
INST_RETURN(2, 0xED, 0x40)
if (INST_REG(0) == REG_C && INST_PORT(1).type == AT_REGISTER)
INST_RETURN(2, 0xED, 0x48)
if (INST_REG(0) == REG_D && INST_PORT(1).type == AT_REGISTER)
INST_RETURN(2, 0xED, 0x50)
if (INST_REG(0) == REG_E && INST_PORT(1).type == AT_REGISTER)
INST_RETURN(2, 0xED, 0x58)
if (INST_REG(0) == REG_H && INST_PORT(1).type == AT_REGISTER)
INST_RETURN(2, 0xED, 0x60)
if (INST_REG(0) == REG_L && INST_PORT(1).type == AT_REGISTER)
INST_RETURN(2, 0xED, 0x68)
INST_ERROR(ARG_VALUE)
}
if (INST_NARGS == 1 && INST_TYPE(0) == AT_PORT) {
if (INST_PORT(0).type == AT_REGISTER)
INST_RETURN(2, 0xED, 0x70)
INST_ERROR(ARG_VALUE)
}
INST_ERROR(ARG_TYPE)
}

INST_FUNC(inc)
{
INST_TAKES_ARGS(
@@ -1169,8 +1248,11 @@ static ASMInstParser lookup_parser(uint32_t key)
HANDLE(di)
HANDLE(djnz)
HANDLE(ei)
HANDLE(ex)
HANDLE(exx)
HANDLE(halt)
HANDLE(im)
HANDLE(in)
HANDLE(inc)
HANDLE(ind)
HANDLE(indr)


+ 50
- 10
src/assembler/instructions.yml View File

@@ -376,9 +376,19 @@ ei:
args: no
return: [0xFB]

# ex:
# args: yes
# return: TODO
ex:
args: yes
cases:
- type: [register, register]
cases:
- cond: [af, af_]
return: [0x08]
- cond: [de, hl]
return: [0xEB]
- type: [indirect, register]
cases:
- cond: [reg.sp, hl|i]
return: [0xE3]

exx:
args: no
@@ -388,13 +398,43 @@ halt:
args: no
return: [0x76]

# im:
# args: yes
# return: TODO

# in:
# args: yes
# return: TODO
im:
args: yes
cases:
- type: [immediate]
cases:
- cond: [im.0]
return: [0xED, 0x46]
- cond: [im.1]
return: [0xED, 0x56]
- cond: [im.2]
return: [0xED, 0x5E]

in:
args: yes
cases:
- type: [register, port]
cases:
- cond: [a, imm]
return: [0xDB, u8]
- cond: [a, reg.c]
return: [0xED, 0x78]
- cond: [b, reg.c]
return: [0xED, 0x40]
- cond: [c, reg.c]
return: [0xED, 0x48]
- cond: [d, reg.c]
return: [0xED, 0x50]
- cond: [e, reg.c]
return: [0xED, 0x58]
- cond: [h, reg.c]
return: [0xED, 0x60]
- cond: [l, reg.c]
return: [0xED, 0x68]
- type: [port]
cases:
- cond: [reg.c]
return: [0xED, 0x70]

inc:
args: yes


Loading…
Cancel
Save