Minix/minix
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

kernel, arm ucontext: ARM DBG=-g run fixes

Browse Source 
kernel:
	. modules can be as big as the space (8MB) between them
	  instead of 4MB; memory is slightly bigger with DBG=-g

arm ucontext:
	. r4 is clobbered by the restore function, as it's
	  used as a scratch register, causing problems for the
	  DBG=-g build
	. r1-r3 are safe for scratch registers, as they are
	  caller-save, so use r3 instead; and don't bother
	  restoring r1-r3, but preserve r4

vfs:
	. improve TLL pointer sanity check a bit

Change-Id: I0e3cfc367fdc14477e40d04b5e044f288ca4cc7d
This commit is contained in:
Ben Gras
2013-06-23 18:37:57 +02:00
parent 456359aa72
commit cdf2f55a90
3 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
lib/libc/arch/arm/sys-minix/ucontext.S
View File

@@ -126,9 +126,6 @@ ENTRY(setcontext)
pop {r0, r3}
1: /* Restore the registers */
ldr r1, [r0, #REG1] /* Restore r1 */
ldr r2, [r0, #REG2] /* Restore r2 */
ldr r3, [r0, #REG3] /* Restore r3 */
ldr r4, [r0, #REG4] /* Restore r4 */
ldr r5, [r0, #REG5] /* Restore r5 */
ldr r6, [r0, #REG6] /* Restore r6 */
@@ -140,10 +137,10 @@ ENTRY(setcontext)
ldr fp, [r0, #FPREG] /* Restore fp */
ldr sp, [r0, #SPREG] /* Restore sp */
ldr lr, [r0, #LRREG] /* Restore lr */
mov r4, r0
ldr r0, [r4, #REG0] /* Restore r0 */
mov r3, r0
ldr r0, [r3, #REG0] /* Restore r0 */
2:
ldr pc, [r4, #PCREG] /* Restore pc */
ldr pc, [r3, #PCREG] /* Restore pc */
/* void ctx_start()