base/regdump.h (ARM32, ARM64): Properly parenthesize `_regfmt' arguments.

[catacomb] / base / regdump.h

diff --git a/base/regdump.h b/base/regdump.h
index 66933fc..f5b3306 100644 (file)
--- a/base/regdump.h
+++ b/base/regdump.h
@@ -297,12 +297,12 @@ REGDEF_GPX86_ABCD(d, D)
 
        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)                                                \
@@ -403,11 +403,11 @@ DO8(REGDEF_SIMD)
        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
@@ -425,9 +425,9 @@ DO8(REGDEF_SIMD)
        // 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
@@ -643,8 +643,8 @@ DO16(REGDEF_NEONQ)
 .endm
 
 .macro _regfmt arg
-       movw    r2, #\arg&0xffff
-       movt    r2, #(\arg >> 16)&0xffff
+       movw    r2, #(\arg)&0xffff
+       movt    r2, #((\arg) >> 16)&0xffff
 .endm
 
 #endif
@@ -794,8 +794,8 @@ DO32(REGDEF_FP)
 .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
@@ -885,7 +885,7 @@ extern void regdump_freshline(void);
 
 .macro terpri
        _saveregs
-       callext regdump_freshline
+       callext F(regdump_freshline)
        _rstrregs
 .endm
 
@@ -897,7 +897,7 @@ extern void regdump_freshline(void);
                 (((\fmt&REGF_TYMASK) == 0)&regty.\rn) | \
                 (((\fmt&REGF_FMTMASK) == 0)&regfmt.\rn)
        _regfmt .L$reg.fmt$\@
-       callext regdump
+       callext F(regdump)
        _rstrregs
 .endm
 
@@ -909,7 +909,7 @@ extern void regdump_freshline(void);
                 (((\fmt&REGF_TYMASK) == 0)&REGF_32) | \
                 (((\fmt&REGF_FMTMASK) == 0)&REGF_HEX)
        _regfmt .L$mem.fmt$\@
-       callext regdump
+       callext F(regdump)
        _rstrregs
 .endm
 
@@ -917,15 +917,15 @@ extern void regdump_freshline(void);
        _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