regmap_avx = 2*WORDSZ
regmap_size = 3*WORDSZ
-#define REGDEF_GPX86_COMMON(rn, RN) \
- regsrc.e##rn = REGSRC_GP | REGIX_##RN; \
+#define REGDEF_GPX86_COMMON(rn, ix) \
+ regsrc.e##rn = REGSRC_GP | ix; \
regty.e##rn = REGF_32; \
regfmt.e##rn = REGF_HEX; \
- regsrc.r##rn = REGSRC_GP | REGIX_##RN; \
+ regsrc.r##rn = REGSRC_GP | ix; \
regty.r##rn = REGF_64; \
regfmt.r##rn = REGF_HEX
regsrc.rn##x = REGSRC_GP | REGIX_##RN##X; \
regty.rn##x = REGF_16; \
regfmt.rn##x = REGF_HEX; \
- REGDEF_GPX86_COMMON(rn##x, RN##X)
+ REGDEF_GPX86_COMMON(rn##x, REGIX_##RN##X)
REGDEF_GPX86_ABCD(a, A)
REGDEF_GPX86_ABCD(b, B)
REGDEF_GPX86_ABCD(c, C)
regsrc.eflags = REGSRC_GP | REGIX_FLAGS
regty.eflags = REGF_32
- regty.eflags = 0
+ regfmt.eflags = 0
#if CPUFAM_AMD64
regsrc.rflags = REGSRC_GP | REGIX_FLAGS
regty.rflags = REGF_64
- regty.rflags = 0
+ regfmt.rflags = 0
#endif
#define REGDEF_GPX86_XP(rn, RN) \
regsrc.rn = REGSRC_GP | REGIX_##RN; \
regty.rn = REGF_16; \
regfmt.rn = REGF_HEX; \
- REGDEF_GPX86_COMMON(rn, RN)
+ REGDEF_GPX86_COMMON(rn, REGIX_##RN)
REGDEF_GPX86_XP(ip, IP)
REGDEF_GPX86_XP(si, SI)
REGDEF_GPX86_XP(di, DI)
mov [esp + 4*REGIX_BX], ebx
ldgot
# endif
- callext regdump_gpsave
+ callext F(regdump_gpsave)
// Make space for the extended registers.
sub R_sp(r), R_c(r)
- callext regdump_xtsave
+ callext F(regdump_xtsave)
// Prepare for calling back into C. On 32-bit x86, leave space for
// the arguments and set up the GOT pointer; on AMD64 Windows, leave
// Restore registers.
// We assume r/ebp still points to the register map.
- callext regdump_xtrstr
+ callext F(regdump_xtrstr)
mov R_sp(r), R_bp(r)
- callext regdump_gprstr
+ callext F(regdump_gprstr)
popf
lea R_sp(r), [R_sp(r) + REGDUMP_SPADJ]
.endm
.endm
.macro _regfmt arg
- movw r2, #\arg&0xffff
- movt r2, #(\arg >> 16)&0xffff
+ movw r2, #(\arg)&0xffff
+ movt r2, #((\arg) >> 16)&0xffff
.endm
#endif
.endm
.macro _regfmt arg
- movz w2, #\arg&0xffff
- movk w2, #(\arg >> 16)&0xffff, lsl #16
+ movz w2, #(\arg)&0xffff
+ movk w2, #((\arg) >> 16)&0xffff, lsl #16
.endm
#endif
.macro terpri
_saveregs
- callext regdump_freshline
+ callext F(regdump_freshline)
_rstrregs
.endm
(((\fmt®F_TYMASK) == 0)®ty.\rn) | \
(((\fmt®F_FMTMASK) == 0)®fmt.\rn)
_regfmt .L$reg.fmt$\@
- callext regdump
+ callext F(regdump)
_rstrregs
.endm
(((\fmt®F_TYMASK) == 0)®F_32) | \
(((\fmt®F_FMTMASK) == 0)®F_HEX)
_regfmt .L$mem.fmt$\@
- callext regdump
+ callext F(regdump)
_rstrregs
.endm
_saveregs
.ifnes "\gp", "nil"
_regbase
- callext regdump_gp
+ callext F(regdump_gp)
.endif
.ifnes "\fp", "nil"
_regbase
- callext regdump_fp
+ callext F(regdump_fp)
.endif
.ifnes "\simd", "nil"
_regbase
- callext regdump_simd
+ callext F(regdump_simd)
.endif
_rstrregs
.endm