From 1ad2eb51109481a993c0a601bd86600b12c44793 Mon Sep 17 00:00:00 2001 From: Horst Schirmeier Date: Sun, 16 Mar 2014 18:53:47 +0100 Subject: [PATCH] core/sal: fix x86 register IDs for x86_64 This bug mapped EFLAGS to the same Fail* register ID as R9 on x86_64. This probably has not had consequences yet, as most FailBochs users use 32-bit code. Change-Id: I00a680675bb9e73c2781276f3ef651162c8e4445 --- src/core/sal/x86/X86Architecture.hpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/core/sal/x86/X86Architecture.hpp b/src/core/sal/x86/X86Architecture.hpp index 00cae041..5d74db6b 100644 --- a/src/core/sal/x86/X86Architecture.hpp +++ b/src/core/sal/x86/X86Architecture.hpp @@ -34,9 +34,10 @@ enum GPRegisterId { RID_R8, RID_R9, RID_R10, RID_R11, RID_R12, RID_R13, RID_R14, RID_R15, #else // 32 bit register id's: RID_EAX = 0, RID_ECX, RID_EDX, RID_EBX, RID_ESP, RID_EBP, RID_ESI, RID_EDI, - #endif // common register id's (independent of the current register width): - RID_CAX = 0, RID_CCX, RID_CDX, RID_CBX, RID_CSP, RID_CBP, RID_CSI, RID_CDI, - RID_LAST_GP_ID + #endif + RID_LAST_GP_ID, + // common register id's (independent of the current register width): + RID_CAX = 0, RID_CCX, RID_CDX, RID_CBX, RID_CSP, RID_CBP, RID_CSI, RID_CDI }; /**