Changeset 15d0046 in mainline for kernel/arch/mips32/src/start.S

Timestamp:

2014-09-12T13:22:33Z (10 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

9b20126

Parents:

8db09e4 (diff), 105d8d6 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes

File:

• kernel/arch/mips32/src/start.S (modified) (6 diffs)

kernel/arch/mips32/src/start.S

@@ -30 +30 @@
 #include <arch/mm/page.h>
 #include <arch/asm/boot.h>
-#include <arch/context_offset.h>
 #include <arch/stack.h>
+#include <arch/istate_struct.h>
 
 .text
@@ -51 +51 @@
 #define REG_SAVE_MASK 0x1f
 
-#define ISTATE_OFFSET_A0        0
-#define ISTATE_OFFSET_A1        4
-#define ISTATE_OFFSET_A2        8
-#define ISTATE_OFFSET_A3        12
-#define ISTATE_OFFSET_T0        16
-#define ISTATE_OFFSET_T1        20
-#define ISTATE_OFFSET_V0        24
-#define ISTATE_OFFSET_V1        28
-#define ISTATE_OFFSET_AT        32
-#define ISTATE_OFFSET_T2        36
-#define ISTATE_OFFSET_T3        40
-#define ISTATE_OFFSET_T4        44
-#define ISTATE_OFFSET_T5        48
-#define ISTATE_OFFSET_T6        52
-#define ISTATE_OFFSET_T7        56
-#define ISTATE_OFFSET_S0        60
-#define ISTATE_OFFSET_S1        64
-#define ISTATE_OFFSET_S2        68
-#define ISTATE_OFFSET_S3        72
-#define ISTATE_OFFSET_S4        76
-#define ISTATE_OFFSET_S5        80
-#define ISTATE_OFFSET_S6        84
-#define ISTATE_OFFSET_S7        88
-#define ISTATE_OFFSET_T8        92
-#define ISTATE_OFFSET_T9        96
-#define ISTATE_OFFSET_KT0       100
-#define ISTATE_OFFSET_KT1       104
-#define ISTATE_OFFSET_GP        108
-#define ISTATE_OFFSET_SP        112
-#define ISTATE_OFFSET_S8        116
-#define ISTATE_OFFSET_RA        120
-#define ISTATE_OFFSET_LO        124
-#define ISTATE_OFFSET_HI        128
-#define ISTATE_OFFSET_STATUS    132
-#define ISTATE_OFFSET_EPC       136
-#define ISTATE_OFFSET_ALIGNMENT 140
-
-#define ISTATE_SOFT_SIZE        144
-
 /*
  * The fake ABI prologue is never executed and may not be part of the
@@ -97 +58 @@
  */
 .macro FAKE_ABI_PROLOGUE
-        sub $sp, ISTATE_SOFT_SIZE
+        sub $sp, ISTATE_SIZE
         sw $ra, ISTATE_OFFSET_EPC($sp)
 .endm
@@ -265 +226 @@
         KERNEL_STACK_TO_K0
         
-        sub $k0, ISTATE_SOFT_SIZE
+        sub $k0, ISTATE_SIZE
         sw $sp, ISTATE_OFFSET_SP($k0)
         move $sp, $k0
@@ -355 +316 @@
 tlb_refill_handler:
         KERNEL_STACK_TO_K0
-        sub $k0, ISTATE_SOFT_SIZE
+        sub $k0, ISTATE_SIZE
         REGISTERS_STORE_AND_EXC_RESET $k0
         sw $sp, ISTATE_OFFSET_SP($k0)
@@ -371 +332 @@
 cache_error_handler:
         KERNEL_STACK_TO_K0
-        sub $k0, ISTATE_SOFT_SIZE
+        sub $k0, ISTATE_SIZE
         REGISTERS_STORE_AND_EXC_RESET $k0
         sw $sp, ISTATE_OFFSET_SP($k0)