Skip to content

Commit 3be273a

Browse files
committed
fixes
1 parent 1e35162 commit 3be273a

File tree

3 files changed

+4
-7
lines changed

3 files changed

+4
-7
lines changed

api/src/uvisor-input.S

+1-4
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ uvisor_config:
115115
.long __uvisor_debug_driver
116116

117117
/* Stack limit for public box MSPLIM_NS, accessed by public_box_stack_limit */
118-
.long __uvisor_public_box_stack_limit
118+
.long __StackLimit
119119

120120
/* uVisor mode of operation
121121
* Modes available: UVISOR_ENABLED, UVISOR_DISABLED, UVISOR_PERMISSIVE. */
@@ -137,9 +137,6 @@ __uvisor_debug_driver:
137137
.long 0
138138
.long 0
139139

140-
__uvisor_public_box_stack_limit:
141-
.long __StackLimit
142-
143140
/* __uvisor_ps is written inside uvisor_init. It must not be
144141
* overwritten by libc init and therefore is placed in .uninitialized. */
145142
.section .uninitialized

core/system/inc/linker.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -122,8 +122,8 @@ typedef struct {
122122

123123
TUvisorDebugDriver const * const debug_driver;
124124

125-
/* Stack limit for public box MSPNS_LIM, accessed by __uvisor_public_box_stack_limit*/
126-
uint32_t * public_box_stack_limit;
125+
/* Stack limit for public box MSPNS_LIM*/
126+
uint32_t public_box_stack_limit;
127127
} UVISOR_PACKED UvisorConfig;
128128

129129
extern UvisorConfig const __uvisor_config;

core/system/src/main.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ void main_init(void)
162162
__TZ_set_MSP_NS(original_sp);
163163

164164
/* NS P limit, for the RTOS and the uVisor-ns. */
165-
__TZ_set_MSPLIM_NS(*(__uvisor_config.public_box_stack_limit));
165+
__TZ_set_MSPLIM_NS(__uvisor_config.public_box_stack_limit);
166166

167167
/* S NP stack pointer, for the SDSs and the transition gateways. */
168168
__set_PSP((uint32_t) &__uvisor_stack_top_np__);

0 commit comments

Comments
 (0)