From f9cc6d648469dbf454997ff7f61ae457ff11a4bb Mon Sep 17 00:00:00 2001
From: Lioncash <mathew1800@gmail.com>
Date: Mon, 6 Apr 2015 15:58:45 -0400
Subject: vfp: Get rid of the VFP_OFFSET macro

---
 src/core/arm/skyeye_common/arm_regformat.h | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

(limited to 'src/core/arm/skyeye_common/arm_regformat.h')

diff --git a/src/core/arm/skyeye_common/arm_regformat.h b/src/core/arm/skyeye_common/arm_regformat.h
index d125dc2f..6c89774e 100644
--- a/src/core/arm/skyeye_common/arm_regformat.h
+++ b/src/core/arm/skyeye_common/arm_regformat.h
@@ -51,13 +51,18 @@ enum {
     EXCLUSIVE_STATE,
     EXCLUSIVE_RESULT,
 
-    // VFP registers
-    VFP_BASE,
-    VFP_FPSID = VFP_BASE,
+    MAX_REG_NUM,
+};
+
+// VFP system registers
+enum {
+    VFP_FPSID,
     VFP_FPSCR,
     VFP_FPEXC,
 
-    MAX_REG_NUM,
+    // Not an actual register.
+    // All VFP system registers should be defined above this.
+    VFP_SYSTEM_REGISTER_COUNT
 };
 
 enum CP15Register {
@@ -176,5 +181,3 @@ enum CP15Register {
     // All registers should be defined above this.
     CP15_REGISTER_COUNT,
 };
-
-#define VFP_OFFSET(x)   (x - VFP_BASE)
-- 
cgit v1.2.3