77a78,83
>
> def regIdx(idx):
> return "InstRegIndex(%s)" % idx
>
> assembler.symbols["regIdx"] = regIdx
>
80c86
< assembler.symbols["t%d" % num] = "NUM_INTREGS+%d" % num
---
> assembler.symbols["t%d" % num] = regIdx("NUM_INTREGS+%d" % num)
82c88,89
< assembler.symbols["ufp%d" % num] = "FLOATREG_MICROFP(%d)" % num
---
> assembler.symbols["ufp%d" % num] = \
> regIdx("FLOATREG_MICROFP(%d)" % num)
85c92,93
< assembler.symbols["%ss" % letter.lower()] = "SEGMENT_REG_%sS" % letter
---
> assembler.symbols["%ss" % letter.lower()] = \
> regIdx("SEGMENT_REG_%sS" % letter)
94c102
< assembler.symbols[reg.lower()] = "SYS_SEGMENT_REG_%s" % reg
---
> assembler.symbols[reg.lower()] = regIdx("SYS_SEGMENT_REG_%s" % reg)
97c105
< assembler.symbols[reg.lower()] = "SEGMENT_REG_%s" % reg
---
> assembler.symbols[reg.lower()] = regIdx("SEGMENT_REG_%s" % reg)
101,106c109,114
< "reg" : "env.reg",
< "xmml" : "FLOATREG_XMM_LOW(env.reg)",
< "xmmh" : "FLOATREG_XMM_HIGH(env.reg)",
< "regm" : "env.regm",
< "xmmlm" : "FLOATREG_XMM_LOW(env.regm)",
< "xmmhm" : "FLOATREG_XMM_HIGH(env.regm)",
---
> "reg" : regIdx("env.reg"),
> "xmml" : regIdx("FLOATREG_XMM_LOW(env.reg)"),
> "xmmh" : regIdx("FLOATREG_XMM_HIGH(env.reg)"),
> "regm" : regIdx("env.regm"),
> "xmmlm" : regIdx("FLOATREG_XMM_LOW(env.regm)"),
> "xmmhm" : regIdx("FLOATREG_XMM_HIGH(env.regm)"),
109c117
< "seg" : "env.seg",
---
> "seg" : regIdx("env.seg"),
111,112c119,120
< "index" : "env.index",
< "base" : "env.base",
---
> "index" : regIdx("env.index"),
> "base" : regIdx("env.base"),
136c144
< assembler.symbols["intseg"] = "SEGMENT_REG_MS"
---
> assembler.symbols["intseg"] = regIdx("SEGMENT_REG_MS")
139c147
< assembler.symbols["flatseg"] = "SEGMENT_REG_LS"
---
> assembler.symbols["flatseg"] = regIdx("SEGMENT_REG_LS")
143c151,152
< assembler.symbols["r%s" % reg] = "INTREG_R%s" % reg.upper()
---
> assembler.symbols["r%s" % reg] = \
> regIdx("INTREG_R%s" % reg.upper())
146c155
< assembler.symbols["cr%d" % reg] = "MISCREG_CR%d" % reg
---
> assembler.symbols["cr%d" % reg] = regIdx("MISCREG_CR%d" % reg)
167c176
< assembler.symbols[reg] = "MISCREG_%s" % reg.upper()
---
> assembler.symbols[reg] = regIdx("MISCREG_%s" % reg.upper())
204c213
< return "(NUM_FLOATREGS + (((%s) + 8) %% 8))" % index
---
> return regIdx("NUM_FLOATREGS + (((%s) + 8) %% 8)" % index)