X-Git-Url: https://git.distorted.org.uk/~mdw/catacomb/blobdiff_plain/a752c20fda86bcc14a23539fc20bea32fb541e18..8f2287ef5c05d496fcb9b012629af007fe56f897:/base/regdump.h

diff --git a/base/regdump.h b/base/regdump.h
index aae35bc5..f5b33068 100644
--- 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)						\
@@ -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