Commit Diff

Commit:
1f770c097ec89ec7e76870f571131fe7038705d7
From:
powerpc64 <powerpc64@localhost>
Date:
Message:
fix the global offsets. This may have introduced a bug, ie. ori %r9, %r9, _C_LABEL(proc0paddr)@l std %r8, _C_LABEL(proc0paddr)@l(%r9) I'm not a asm pro but deep down it tells me that something may be wrong here. Wait and see.
Actions:
Patch | Tree
commit - c7d8b33adced026e7951d027868b5234155506e6
commit + 1f770c097ec89ec7e76870f571131fe7038705d7
blob - 7bc277aace130308a2a1b41f6c7ab6fb5e8fa5fd
blob + 1b50846ce4fda5e7fa8b8ceb2639847117f5f8c5
--- aim64/locore0.S
+++ aim64/locore0.S
@@ -87,8 +87,8 @@ start:
 	sldi	%r3, %r3, 32
 	oris	%r3, %r3, fwargsave@ha
 	ori	%r3, %r3, fwargsave@l
-	std	%r6, fwargsave(%r3)
-	std	%r7, fwargsave+8(%r3)
+	std	%r6, fwargsave@l(%r3)
+	std	%r7, fwargsave@l+8(%r3)
 	bl	ofw_init
 	li	%r0,0
 	mtmsr	%r0			/* Disable FPU/MMU/exceptions */
@@ -106,8 +106,8 @@ start:
 	sldi	%r3, %r3, 32
 	oris	%r3, %r3, fwargsave@ha
 	ori	%r3, %r3, fwargsave@l
-	ld	%r6, fwargsave(%r3)
-	ld	%r7, fwargsave+8(%r3)
+	ld	%r6, fwargsave@l(%r3)
+	ld	%r7, fwargsave@l+8(%r3)
 #if defined(DDB)
 	cmpdi	%r6, 0
 	beq	1f
@@ -121,7 +121,7 @@ start:
 	oris	%r8, %r8, _C_LABEL(esym)@ha
 	ori	%r8, %r8, _C_LABEL(esym)@l
 
-	std	%r9,_C_LABEL(esym)(%r8)
+	std	%r9,_C_LABEL(esym)@l(%r8)
 	mr	%r8, %r9
 1:
 #endif
@@ -144,7 +144,7 @@ start:
 	sldi	%r9, %r9, 32
 	oris	%r9, %r9, _C_LABEL(proc0paddr)@ha
 	ori	%r9, %r9, _C_LABEL(proc0paddr)@l
-	std	%r8,_C_LABEL(proc0paddr)(%r9)
+	std	%r8,_C_LABEL(proc0paddr)@l(%r9)
 	addi	%r1,%r8,USPACE-FRAMELEN	/* stackpointer for proc0 */
 	mr	%r4,%r1			/* end of mem reserved for kernel */
 	li	%r0,0