~mdw
/
catacomb
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
base/regdump.h: Pass cooked register index to `REGDEF_GPX86_COMMON'.
[catacomb]
/
base
/
regdump.h
diff --git
a/base/regdump.h
b/base/regdump.h
index
bbbd5bd
..
db96864
100644
(file)
--- a/
base/regdump.h
+++ b/
base/regdump.h
@@
-271,11
+271,11
@@
struct regmap {
regmap_avx = 2*WORDSZ
regmap_size = 3*WORDSZ
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; \
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
regty.r##rn = REGF_64; \
regfmt.r##rn = REGF_HEX
@@
-289,7
+289,7
@@
struct regmap {
regsrc.rn##x = REGSRC_GP | REGIX_##RN##X; \
regty.rn##x = REGF_16; \
regfmt.rn##x = 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, R
EGIX_##R
N##X)
REGDEF_GPX86_ABCD(a, A)
REGDEF_GPX86_ABCD(b, B)
REGDEF_GPX86_ABCD(c, C)
REGDEF_GPX86_ABCD(a, A)
REGDEF_GPX86_ABCD(b, B)
REGDEF_GPX86_ABCD(c, C)
@@
-312,7
+312,7
@@
REGDEF_GPX86_ABCD(d, D)
regsrc.rn = REGSRC_GP | REGIX_##RN; \
regty.rn = REGF_16; \
regfmt.rn = REGF_HEX; \
regsrc.rn = REGSRC_GP | REGIX_##RN; \
regty.rn = REGF_16; \
regfmt.rn = REGF_HEX; \
- REGDEF_GPX86_COMMON(rn, RN)
+ REGDEF_GPX86_COMMON(rn, R
EGIX_##R
N)
REGDEF_GPX86_XP(ip, IP)
REGDEF_GPX86_XP(si, SI)
REGDEF_GPX86_XP(di, DI)
REGDEF_GPX86_XP(ip, IP)
REGDEF_GPX86_XP(si, SI)
REGDEF_GPX86_XP(di, DI)
@@
-643,8
+643,8
@@
DO16(REGDEF_NEONQ)
.endm
.macro _regfmt arg
.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
#endif
@@
-794,8
+794,8
@@
DO32(REGDEF_FP)
.endm
.macro _regfmt arg
.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
.endm
#endif