summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Johnson <peter@tortall.net>2010-08-01 01:37:37 +0000
committerPeter Johnson <peter@tortall.net>2010-08-01 01:37:37 +0000
commitf288243be42274ba5d45ca14bba9ea4545220bd6 (patch)
tree317b7393f21ac2e66b35f8616cf84f35d511b011
parentabaf3f7d492962bf624cc16b306cde6758ca9557 (diff)
downloadyasm-f288243be42274ba5d45ca14bba9ea4545220bd6.tar.gz
Rename RDRND feature bit to RDRAND.
svn path=/trunk/yasm/; revision=2346
-rwxr-xr-xmodules/arch/x86/gen_x86_insn.py10
-rw-r--r--modules/arch/x86/x86arch.h2
-rw-r--r--modules/arch/x86/x86cpu.gperf4
3 files changed, 8 insertions, 8 deletions
diff --git a/modules/arch/x86/gen_x86_insn.py b/modules/arch/x86/gen_x86_insn.py
index 796f0b18..d04601e4 100755
--- a/modules/arch/x86/gen_x86_insn.py
+++ b/modules/arch/x86/gen_x86_insn.py
@@ -43,7 +43,7 @@ ordered_cpu_features = [
"FPU", "Cyrix", "AMD", "MMX", "3DNow", "SMM", "SSE", "SSE2",
"SSE3", "SVM", "PadLock", "SSSE3", "SSE41", "SSE42", "SSE4a", "SSE5",
"AVX", "FMA", "AES", "CLMUL", "MOVBE", "XOP", "FMA4", "F16C",
- "FSGSBASE", "RDRND", "XSAVEOPT", "EPTVPID", "SMX"]
+ "FSGSBASE", "RDRAND", "XSAVEOPT", "EPTVPID", "SMX"]
unordered_cpu_features = ["Priv", "Prot", "Undoc", "Obs"]
# Predefined VEX prefix field values
@@ -6753,22 +6753,22 @@ for comb, combval in zip(["lql","hql","lqh","hqh"], [0x00,0x01,0x10,0x11]):
# AVX Post-32nm instructions
#####################################################################
-# RDRND
+# RDRAND
add_group("rdrand",
- cpu=["RDRND"],
+ cpu=["RDRAND"],
opersize=16,
opcode=[0x0F, 0xC7],
spare=6,
operands=[Operand(type="Reg", size=16, dest="EA")])
add_group("rdrand",
#suffix="l",
- cpu=["RDRND"],
+ cpu=["RDRAND"],
opersize=32,
opcode=[0x0F, 0xC7],
spare=6,
operands=[Operand(type="Reg", size=32, dest="EA")])
add_group("rdrand",
- cpu=["RDRND"],
+ cpu=["RDRAND"],
opersize=64,
opcode=[0x0F, 0xC7],
spare=6,
diff --git a/modules/arch/x86/x86arch.h b/modules/arch/x86/x86arch.h
index 773f163e..d1ba2325 100644
--- a/modules/arch/x86/x86arch.h
+++ b/modules/arch/x86/x86arch.h
@@ -74,7 +74,7 @@
#define CPU_FMA4 40 /* AMD Fused-Multiply-Add extensions */
#define CPU_F16C 41 /* Intel float-16 instructions */
#define CPU_FSGSBASE 42 /* Intel FSGSBASE instructions */
-#define CPU_RDRND 43 /* Intel RDRND instruction */
+#define CPU_RDRAND 43 /* Intel RDRAND instruction */
#define CPU_XSAVEOPT 44 /* Intel XSAVEOPT instruction */
#define CPU_EPTVPID 45 /* Intel INVEPT, INVVPID instructions */
#define CPU_SMX 46 /* Intel SMX instruction (GETSEC) */
diff --git a/modules/arch/x86/x86cpu.gperf b/modules/arch/x86/x86cpu.gperf
index 488f2791..e83be09a 100644
--- a/modules/arch/x86/x86cpu.gperf
+++ b/modules/arch/x86/x86cpu.gperf
@@ -381,8 +381,8 @@ f16c, x86_cpu_set, CPU_F16C
nof16c, x86_cpu_clear, CPU_F16C
fsgsbase, x86_cpu_set, CPU_FSGSBASE
nofsgsbase, x86_cpu_clear, CPU_FSGSBASE
-rdrnd, x86_cpu_set, CPU_RDRND
-nordrnd, x86_cpu_clear, CPU_RDRND
+rdrand, x86_cpu_set, CPU_RDRAND
+nordrand, x86_cpu_clear, CPU_RDRAND
xsaveopt, x86_cpu_set, CPU_XSAVEOPT
noxsaveopt, x86_cpu_clear, CPU_XSAVEOPT
eptvpid, x86_cpu_set, CPU_EPTVPID