diff --git a/src/0000Boot/0000Kernel.BIN.C b/src/0000Boot/0000Kernel.BIN.C index da7facdb..179362a1 100755 Binary files a/src/0000Boot/0000Kernel.BIN.C and b/src/0000Boot/0000Kernel.BIN.C differ diff --git a/src/Compiler/Compiler.BIN b/src/Compiler/Compiler.BIN index 92042425..a64f470c 100755 Binary files a/src/Compiler/Compiler.BIN and b/src/Compiler/Compiler.BIN differ diff --git a/src/Kernel.BIN.C b/src/Kernel.BIN.C index 77807e2b..f13eada7 100755 Binary files a/src/Kernel.BIN.C and b/src/Kernel.BIN.C differ diff --git a/src/Tmp/Zenith-Latest.iso b/src/Tmp/Zenith-Latest.iso index fb2fbae0..98bd57d6 100755 Binary files a/src/Tmp/Zenith-Latest.iso and b/src/Tmp/Zenith-Latest.iso differ diff --git a/src/Zenith/Boot/BootRAM.CC b/src/Zenith/Boot/BootRAM.CC index 3707318c..a97ce956 100755 --- a/src/Zenith/Boot/BootRAM.CC +++ b/src/Zenith/Boot/BootRAM.CC @@ -10,7 +10,7 @@ _HI_CALL:: @@05: POP RBP RET1 8 //************************************ -_HI_MEMCPY:: +_HI_MEMCOPY:: PUSH RBP MOV RBP,RSP PUSH RSI @@ -27,16 +27,14 @@ _HI_MEMCPY:: RET1 24 } _extern _HI_CALL I64 HiCall(U8 *machine_code); -_extern _HI_MEMCPY U8 *HiMemCpy(U8 *dst,U8 *src,I64 count); +_extern _HI_MEMCOPY U8 *HiMemCopy(U8 *dst,U8 *src,I64 count); #help_index "Boot" -public U0 BootRAM(U8 *filename=NULL) +public U0 BootRAM(U8 *filename="::/" KERNEL_BIN_C) {//Softboot Kernel.BIN file. No hardware reset. I64 size; CKernel *hi_image,*lo_image=mem_boot_base-sizeof(CBinFile), reg *sys_ram_reboot; - if (!filename) - filename="::/" KERNEL_BIN_C; do if (!(hi_image=FileRead(filename,&size))) return; while (hi_image<0x100000); //If alloc from low 640K, just get another copy. @@ -54,7 +52,8 @@ public U0 BootRAM(U8 *filename=NULL) if (mp_count>1) MPHalt; - HiMemCpy(sys_ram_reboot,SYS_RAM_REBOOT,SYS_RAM_REBOOT_END-SYS_RAM_REBOOT); - HiMemCpy(lo_image,hi_image,size); + HiMemCopy(sys_ram_reboot,SYS_RAM_REBOOT,SYS_RAM_REBOOT_END-SYS_RAM_REBOOT); + HiMemCopy(lo_image,hi_image,size); HiCall(sys_ram_reboot); } + \ No newline at end of file