fix compilation issues in aarch64 ports

[lunaix-os.git] / lunaix-os / arch / aarch64 / includes / asm / hart.h

diff --git a/lunaix-os/arch/aarch64/includes/asm/hart.h b/lunaix-os/arch/aarch64/includes/asm/hart.h
index 89a2e9ae881574564f2d36e4fa09f44107676f72..fa1f4bfd165f7b30322d84bc398c9b98e27ff13c 100644 (file)
--- a/lunaix-os/arch/aarch64/includes/asm/hart.h
+++ b/lunaix-os/arch/aarch64/includes/asm/hart.h
@@ -6,7 +6,7 @@
 #include <lunaix/bits.h>
 #include <asm/aa64_spsr.h>
 
-#define SYNDROME_ETYPE  BITS(63, 56)
+#define SYNDROME_ETYPE  BITFIELD(63, 56)
 
 struct hart_state;
 
@@ -15,7 +15,7 @@ struct regcontext
     union {
         reg_t x[31];
         struct {
-            reg_t x[29];
+            reg_t x_[29];
             reg_t fp;
             reg_t lr;
         };
@@ -29,7 +29,7 @@ struct exec_param
     reg_t link;
     struct {
         reg_t sp_el0;
-        reg_t sp_el1;
+        reg_t rsvd;
     };
     
     reg_t syndrome;
@@ -73,10 +73,7 @@ hart_pc(struct hart_state* hstate)
 static inline ptr_t
 hart_sp(struct hart_state* hstate)
 {
-    if (spsr_from_el0(hstate->execp.spsr)) {
-        return hstate->execp.sp_el0;
-    }
-    return hstate->execp.sp_el1;
+    return __ptr(&hstate[-1]);
 }
 
 static inline bool