TempleOSCD_150216.ISO

Kernel/BIOS32.CPP

@@ -85,9 +85,9 @@ _FAR_CALL32::
 	PUSH	U64 FS:CTask.addr[RAX]
 	PUSH	U64 GS:CCPU.addr[RAX]
 	MOV	U64 [C32_RSP],RSP
-	PUSH	U32 CGDT.ds	//STKSEG
-	PUSH	U32 0x9C000	//STK
-	PUSH	U32 0		//FLAGS--interrupts off
+	PUSH	U32 CGDT.ds		//STKSEG
+	PUSH	U32 BOOT_RAM_LIMIT	//STK
+	PUSH	U32 0			//FLAGS--interrupts off
 	PUSH	U32 CGDT.cs32
 	LEA	RAX,[@@15]
 	PUSH	RAX
@@ -132,15 +132,10 @@ C32_ADD:: DU32	0;
 	MOV	U32 [C32_ESI],ESI
 	MOV	U32 [C32_EDI],EDI
 
-	CALL	INIT_EM64T
-USE64
-	MOV	AX,CGDT.ds
-	MOV	DS,AX
-	MOV	ES,AX
-	MOV	SS,AX
-
-	MOV	RSP,U64 [C32_RSP]
+	PUSH	U32 0	//Return from next call will be 64-bit
+	CALL	SYS_EM64T
 
+USE64	MOV	RSP,U64 [C32_RSP]
 	POP	RAX
 	CALL	SET_GS_BASE
 	POP	RAX