From dbf130e6816db0a0d535026fb7f1ae8837a76aa1 Mon Sep 17 00:00:00 2001
From: "H. Peter Anvin" <hpa@zytor.com>
Date: Wed, 30 May 2007 00:18:26 +0000
Subject: [PATCH] Rename REGNORM to REG_EA
Rename REGNORM to REG_EA to make the distinction between REG_GPR and
REG_EA clearer.
---
disasm.c | 3 ++-
nasm.h | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/disasm.c b/disasm.c
index 8ba6295f..b7fd224b 100644
--- a/disasm.c
+++ b/disasm.c
@@ -647,6 +647,7 @@ int32_t disasm(uint8_t *data, char *output, int outbufsize, int segsize,
works = TRUE;
/*
* Final check to make sure the types of r/m match up.
+ * XXX: Need to make sure this is actually correct.
*/
for (i = 0; i < (*p)->operands; i++) {
if (
@@ -655,7 +656,7 @@ int32_t disasm(uint8_t *data, char *output, int outbufsize, int segsize,
!(MEMORY & ~(*p)->opd[i])) ||
/* If it's a reg-only EA but we have a memory ref, die. */
(!(tmp_ins.oprs[i].segment & SEG_RMREG) &&
- !(REGNORM & ~(*p)->opd[i]) &&
+ !(REG_EA & ~(*p)->opd[i]) &&
!((*p)->opd[i] & REG_SMASK)) ||
/* Register type mismatch (eg FS vs REG_DESS): die. */
((((*p)->opd[i] & (REGISTER | FPUREG)) ||
diff --git a/nasm.h b/nasm.h
index 14eeeea8..da66d3e7 100644
--- a/nasm.h
+++ b/nasm.h
@@ -467,7 +467,7 @@ enum {
#define REGMEM 0x00008000L /* for r/m, ie EA, operands */
/* Register classes */
-#define REGNORM 0x00009000L /* 'normal' reg, qualifies as EA */
+#define REG_EA 0x00009000L /* 'normal' reg, qualifies as EA */
#define REG_GPR 0x00209000L /* integer register */
#define REG8 0x00209001L /* 8-bit GPR */
#define REG16 0x00209002L /* 16-bit GPR */