RTOS/rtems
1
0
Fork 0
forked from Imagelibrary/rtems
Code Pull Requests Activity

sparc64: Rename CPU_Minimum_stack_frame

Browse Source 
Rename SPARC64-specific CPU_Minimum_stack_frame to
SPARC64_Minimum_stack_frame.  Rename SPARC64-specific
CPU_MINIMUM_STACK_FRAME_SIZE to SPARC64_MINIMUM_STACK_FRAME_SIZE.

Update #2809.
This commit is contained in:
Sebastian Huber
2016-11-11 11:16:33 +01:00
parent 141e16d225
commit d18560ae05
5 changed files with 32 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
c/src/lib/libbsp/sparc64/shared/start/start.S
View File

@@ -140,10 +140,10 @@ halted: nop
.section BOOTSTRAP .section BOOTSTRAP
.align CPU_ALIGNMENT .align CPU_ALIGNMENT
.space 32768 - CPU_MINIMUM_STACK_FRAME_SIZE ! 32K boot stack grows down .space 32768 - SPARC64_MINIMUM_STACK_FRAME_SIZE ! 32K boot stack grows down
.global StackStart .global StackStart
StackStart: StackStart:
.space CPU_MINIMUM_STACK_FRAME_SIZE ! initial stack frame .space SPARC64_MINIMUM_STACK_FRAME_SIZE ! initial stack frame
.section BOOTSTRAP .section BOOTSTRAP
.align CPU_ALIGNMENT .align CPU_ALIGNMENT

2
c/src/lib/libcpu/sparc64/shared/score/interrupt.S
View File

@@ -197,7 +197,7 @@ PUBLIC(_ISR_Handler)
* enable traps again. * enable traps again.
*/ */
sub %sp, CPU_MINIMUM_STACK_FRAME_SIZE, %sp sub %sp, SPARC64_MINIMUM_STACK_FRAME_SIZE, %sp
dont_switch_stacks: dont_switch_stacks:
/* /*

6
cpukit/score/cpu/sparc64/context.S
View File

@@ -39,7 +39,7 @@
.align 4 .align 4
PUBLIC(_CPU_Context_save_fp) PUBLIC(_CPU_Context_save_fp)
SYM(_CPU_Context_save_fp): SYM(_CPU_Context_save_fp):
save %sp, -CPU_MINIMUM_STACK_FRAME_SIZE, %sp save %sp, -SPARC64_MINIMUM_STACK_FRAME_SIZE, %sp
/* /*
* The following enables the floating point unit. * The following enables the floating point unit.
@@ -105,7 +105,7 @@ PUBLIC(_CPU_Context_save_fp)
.align 4 .align 4
PUBLIC(_CPU_Context_restore_fp) PUBLIC(_CPU_Context_restore_fp)
SYM(_CPU_Context_restore_fp): SYM(_CPU_Context_restore_fp):
save %sp, -CPU_MINIMUM_STACK_FRAME_SIZE , %sp save %sp, -SPARC64_MINIMUM_STACK_FRAME_SIZE , %sp
/* /*
* The following enables the floating point unit. * The following enables the floating point unit.
@@ -300,7 +300,7 @@ PUBLIC(_CPU_Context_restore_heir)
.align 4 .align 4
PUBLIC(_CPU_Context_restore) PUBLIC(_CPU_Context_restore)
SYM(_CPU_Context_restore): SYM(_CPU_Context_restore):
save %sp, -CPU_MINIMUM_STACK_FRAME_SIZE, %sp save %sp, -SPARC64_MINIMUM_STACK_FRAME_SIZE, %sp
! rdpr %pstate, %o2 ! rdpr %pstate, %o2
ba SYM(_CPU_Context_restore_heir) ba SYM(_CPU_Context_restore_heir)
mov %i0, %o1 ! in the delay slot mov %i0, %o1 ! in the delay slot

2
cpukit/score/cpu/sparc64/cpu.c
View File

@@ -90,7 +90,7 @@ void _CPU_Context_Initialize(
*/ */
the_context->o7 = ((uint64_t) entry_point) - 8; the_context->o7 = ((uint64_t) entry_point) - 8;
the_context->o6_sp = stack_high - CPU_MINIMUM_STACK_FRAME_SIZE - STACK_BIAS; the_context->o6_sp = stack_high - SPARC64_MINIMUM_STACK_FRAME_SIZE - STACK_BIAS;
the_context->i6_fp = 0; the_context->i6_fp = 0;
/* ABI uses g4 as segment register, make sure it is zeroed */ /* ABI uses g4 as segment register, make sure it is zeroed */

50
cpukit/score/cpu/sparc64/rtems/score/cpu.h
View File

@@ -238,7 +238,7 @@ typedef struct {
uint64_t saved_arg4; uint64_t saved_arg4;
uint64_t saved_arg5; uint64_t saved_arg5;
uint64_t pad0; uint64_t pad0;
} CPU_Minimum_stack_frame; } SPARC64_Minimum_stack_frame;
#endif /* !ASM */ #endif /* !ASM */
@@ -267,7 +267,7 @@ typedef struct {
#define CPU_STACK_FRAME_SAVED_ARG5_OFFSET 0xB0 #define CPU_STACK_FRAME_SAVED_ARG5_OFFSET 0xB0
#define CPU_STACK_FRAME_PAD0_OFFSET 0xB8 #define CPU_STACK_FRAME_PAD0_OFFSET 0xB8
#define CPU_MINIMUM_STACK_FRAME_SIZE 0xC0 #define SPARC64_MINIMUM_STACK_FRAME_SIZE 0xC0
/* /*
* Contexts * Contexts
@@ -474,7 +474,7 @@ typedef struct {
*/ */
typedef struct { typedef struct {
CPU_Minimum_stack_frame Stack_frame; SPARC64_Minimum_stack_frame Stack_frame;
uint64_t tstate; uint64_t tstate;
uint64_t tpc; uint64_t tpc;
uint64_t tnpc; uint64_t tnpc;
@@ -504,29 +504,29 @@ typedef struct {
* Offsets of fields with CPU_Interrupt_frame for assembly routines. * Offsets of fields with CPU_Interrupt_frame for assembly routines.
*/ */
#define ISF_TSTATE_OFFSET CPU_MINIMUM_STACK_FRAME_SIZE + 0x00 #define ISF_TSTATE_OFFSET SPARC64_MINIMUM_STACK_FRAME_SIZE + 0x00
#define ISF_TPC_OFFSET CPU_MINIMUM_STACK_FRAME_SIZE + 0x08 #define ISF_TPC_OFFSET SPARC64_MINIMUM_STACK_FRAME_SIZE + 0x08
#define ISF_TNPC_OFFSET CPU_MINIMUM_STACK_FRAME_SIZE + 0x10 #define ISF_TNPC_OFFSET SPARC64_MINIMUM_STACK_FRAME_SIZE + 0x10
#define ISF_PIL_OFFSET CPU_MINIMUM_STACK_FRAME_SIZE + 0x18 #define ISF_PIL_OFFSET SPARC64_MINIMUM_STACK_FRAME_SIZE + 0x18
#define ISF_Y_OFFSET CPU_MINIMUM_STACK_FRAME_SIZE + 0x20 #define ISF_Y_OFFSET SPARC64_MINIMUM_STACK_FRAME_SIZE + 0x20
#define ISF_G1_OFFSET CPU_MINIMUM_STACK_FRAME_SIZE + 0x28 #define ISF_G1_OFFSET SPARC64_MINIMUM_STACK_FRAME_SIZE + 0x28
#define ISF_G2_OFFSET CPU_MINIMUM_STACK_FRAME_SIZE + 0x30 #define ISF_G2_OFFSET SPARC64_MINIMUM_STACK_FRAME_SIZE + 0x30
#define ISF_G3_OFFSET CPU_MINIMUM_STACK_FRAME_SIZE + 0x38 #define ISF_G3_OFFSET SPARC64_MINIMUM_STACK_FRAME_SIZE + 0x38
#define ISF_G4_OFFSET CPU_MINIMUM_STACK_FRAME_SIZE + 0x40 #define ISF_G4_OFFSET SPARC64_MINIMUM_STACK_FRAME_SIZE + 0x40
#define ISF_G5_OFFSET CPU_MINIMUM_STACK_FRAME_SIZE + 0x48 #define ISF_G5_OFFSET SPARC64_MINIMUM_STACK_FRAME_SIZE + 0x48
#define ISF_G6_OFFSET CPU_MINIMUM_STACK_FRAME_SIZE + 0x50 #define ISF_G6_OFFSET SPARC64_MINIMUM_STACK_FRAME_SIZE + 0x50
#define ISF_G7_OFFSET CPU_MINIMUM_STACK_FRAME_SIZE + 0x58 #define ISF_G7_OFFSET SPARC64_MINIMUM_STACK_FRAME_SIZE + 0x58
#define ISF_O0_OFFSET CPU_MINIMUM_STACK_FRAME_SIZE + 0x60 #define ISF_O0_OFFSET SPARC64_MINIMUM_STACK_FRAME_SIZE + 0x60
#define ISF_O1_OFFSET CPU_MINIMUM_STACK_FRAME_SIZE + 0x68 #define ISF_O1_OFFSET SPARC64_MINIMUM_STACK_FRAME_SIZE + 0x68
#define ISF_O2_OFFSET CPU_MINIMUM_STACK_FRAME_SIZE + 0x70 #define ISF_O2_OFFSET SPARC64_MINIMUM_STACK_FRAME_SIZE + 0x70
#define ISF_O3_OFFSET CPU_MINIMUM_STACK_FRAME_SIZE + 0x78 #define ISF_O3_OFFSET SPARC64_MINIMUM_STACK_FRAME_SIZE + 0x78
#define ISF_O4_OFFSET CPU_MINIMUM_STACK_FRAME_SIZE + 0x80 #define ISF_O4_OFFSET SPARC64_MINIMUM_STACK_FRAME_SIZE + 0x80
#define ISF_O5_OFFSET CPU_MINIMUM_STACK_FRAME_SIZE + 0x88 #define ISF_O5_OFFSET SPARC64_MINIMUM_STACK_FRAME_SIZE + 0x88
#define ISF_O6_SP_OFFSET CPU_MINIMUM_STACK_FRAME_SIZE + 0x90 #define ISF_O6_SP_OFFSET SPARC64_MINIMUM_STACK_FRAME_SIZE + 0x90
#define ISF_O7_OFFSET CPU_MINIMUM_STACK_FRAME_SIZE + 0x98 #define ISF_O7_OFFSET SPARC64_MINIMUM_STACK_FRAME_SIZE + 0x98
#define ISF_TVEC_OFFSET CPU_MINIMUM_STACK_FRAME_SIZE + 0xA0 #define ISF_TVEC_OFFSET SPARC64_MINIMUM_STACK_FRAME_SIZE + 0xA0
#define CONTEXT_CONTROL_INTERRUPT_FRAME_SIZE CPU_MINIMUM_STACK_FRAME_SIZE + 0xA8 #define CONTEXT_CONTROL_INTERRUPT_FRAME_SIZE SPARC64_MINIMUM_STACK_FRAME_SIZE + 0xA8
#ifndef ASM #ifndef ASM
/* /*
* This variable is contains the initialize context for the FP unit. * This variable is contains the initialize context for the FP unit.