TempleOSCD_150216.ISO

Adam/Boot/Boot.CPP

@@ -0,0 +1,64 @@
+#include "BootCD"
+#include "BootHD"
+#include "BootMHD"
+#include "BootMHD2"
+#include "DskCDDVD"
+#include "BootIns"
+
+#help_index "Call"
+asm {
+USE64
+_HI_CALL::
+	PUSH	RBP
+	MOV	RBP,RSP
+	MOV	RAX,U64 16[RBP]
+	TEST	RAX,RAX
+	JZ	@@05
+	CALL	RAX
+@@05:	POP	RBP
+	RET1	8
+//************************************
+_HI_MEMCPY::
+	PUSH	RBP
+	MOV	RBP,RSP
+	PUSH	RSI
+	PUSH	RDI
+	CLD
+	MOV	RDI,U64 SF_ARG1[RBP]
+	MOV	RSI,U64 SF_ARG2[RBP]
+	MOV	RCX,U64 SF_ARG3[RBP]
+	REP_MOVSB
+	MOV	RAX,RDI
+	POP	RDI
+	POP	RSI
+	POP	RBP
+	RET1	24
+}
+_extern _HI_CALL I64 HiCall(U8 *s);
+_extern _HI_MEMCPY U8 *HiMemCpy(U8 *dst,U8 *src,I64 cnt);
+
+#help_index "Boot"
+public U0 RAMReboot(U8 *filename)
+{//Softboot Kernel Bin file. No hardware reset.
+  I64 size;
+  CKernel *hi_image,*lo_image=sys_boot_base-sizeof(CBinFile),reg *sys_ram_reboot;
+
+  do if (!(hi_image=FileRead(filename,&size))) return;
+  while (hi_image<0x100000);
+
+  do sys_ram_reboot=MAlloc(SYS_RAM_REBOOT_END-SYS_RAM_REBOOT,Fs->code_heap);
+  while (sys_ram_reboot<0x100000);
+
+  hi_image->boot_src=BOOT_SRC_RAM;
+  hi_image->boot_patch_table_base=lo_image(U8 *)+hi_image->h.patch_table_offset;
+  hi_image->sys_run_level =lo_image->sys_run_level&(RLF_VGA|RLF_16BIT);
+  MemCpy(&hi_image->start,&lo_image->start,sizeof(CKernel)-offset(CKernel.start));
+
+  CLI
+  if (mp_cnt>1)
+    MPHalt;
+
+  HiMemCpy(sys_ram_reboot,SYS_RAM_REBOOT,SYS_RAM_REBOOT_END-SYS_RAM_REBOOT);
+  HiMemCpy(lo_image,hi_image,size);
+  HiCall(sys_ram_reboot);
+}

Adam/Boot/BootCD.CPP

@@ -1,17 +1,17 @@
 #define CD_BOOT_LOADER_SIZE	CD_BLK_SIZE*1 //Max CD_BLK_SIZE*4, I think
-#define BOOT_HIGH_LOC	((BOOT_RAM_LIMIT-(BOOT_STK_SIZE+CD_BOOT_LOADER_SIZE))>>4)
+#define BOOT_HIGH_LOC_CD	((BOOT_RAM_LIMIT-(BOOT_STK_SIZE+CD_BOOT_LOADER_SIZE))>>4)
 
 DefinePrint(
-  "DD_BOOT_HIGH_LOC","%08X",BOOT_HIGH_LOC<<4);
+  "DD_BOOT_HIGH_LOC_CD","%08X",BOOT_HIGH_LOC_CD<<4);
 DefinePrint(
-  "DD_BOOT_HIGH_LOC_END","%08X",BOOT_RAM_LIMIT-1);
+  "DD_BOOT_HIGH_LOC_CD_END","%08X",BOOT_RAM_LIMIT-1);
 
 asm {
 USE16
 BCD_START::
 //DL is supposed to have the BIOS drive number
 	CLD
-	MOV	AX,BOOT_HIGH_LOC
+	MOV	AX,BOOT_HIGH_LOC_CD
 	MOV	ES,AX
 
 	CLI
@@ -24,7 +24,7 @@ BCD_GET_IP:
 	POP	BX
 	SUB	BX,BCD_GET_IP-BCD_START
 	SHR	BX,4
-//Copy this bootloader code to just under 0x80000
+//This copies this bootloader's code to 0x$TX,"00096600",D="DD_BOOT_HIGH_LOC_CD"$
 	MOV	AX,CS
 	ADD	AX,BX
 	MOV	DS,AX
@@ -33,12 +33,12 @@ BCD_GET_IP:
 	XOR	DI,DI
 	REP_MOVSB
 
-	MOV	AX,BOOT_HIGH_LOC
+	MOV	AX,BOOT_HIGH_LOC_CD
 	MOV	DS,AX
 
 //My assembler doesn't support 16-bit very well.
-	DU8	0xEA;	//JMP BOOT_HIGH_LOC:BCD_MAIN
-	DU16	BCD_MAIN-BCD_START,BOOT_HIGH_LOC;
+	DU8	0xEA;	//JMP BOOT_HIGH_LOC_CD:BCD_MAIN
+	DU16	BCD_MAIN-BCD_START,BOOT_HIGH_LOC_CD;
 
 BCD_BIOS_DRV_NUM:	DU8	0;
 BCD_PAGE:		DU8	0;
@@ -152,7 +152,7 @@ BCD_MAIN::
 //See $LK,"BootCdProbe",A="MN:BootCdProbe"$().
 	MOV	EBX,U32 [BCD_BLK_LO-BCD_START] //TODO: oops overflow?
 	SHL	EBX,16
-	MOV	BX,BOOT_CODE_CDROM  //$MA-X+PU,"See sys_boot_code",LM="Grep(\"sys_boot_code\",\"/*\");View;\n"$
+	MOV	BX,BOOT_SRC_CDROM  //$MA-X+PU,"See sys_boot_src",LM="Find(\"sys_boot_src\",\"/*\");View;\n"$
 
 //My assembler doesn't support 16-bit very well.
 	DU8	0xEA;	//JMP BOOT_RAM_BASE:0000

Adam/Boot/BootHD.CPP

@@ -1,5 +1,8 @@
 #define MODULE_SIZE		1*BLK_SIZE
-#define BOOT_HIGH_LOC	((BOOT_RAM_LIMIT-(BOOT_STK_SIZE+MODULE_SIZE))>>4)
+#define BOOT_HIGH_LOC_HD	((BOOT_RAM_LIMIT-(BOOT_STK_SIZE+MODULE_SIZE))>>4)
+
+DefinePrint(
+  "DD_BOOT_HIGH_LOC_HD","%08X",BOOT_HIGH_LOC_HD<<4);
 
 asm {
 USE16
@@ -9,11 +12,11 @@ BHD_CODE::
 
 	CLD
 
-	MOV	AX,VGA_TEXT_MEM_BASE/16
+	MOV	AX,VGAM_TEXT/16
 	MOV	FS,AX
 	MOV	U32 FS:[0],'B'+GREEN<<12+('2'+GREEN<<12)<<16
 
-	MOV	AX,BOOT_HIGH_LOC
+	MOV	AX,BOOT_HIGH_LOC_HD
 	MOV	ES,AX
 
 	CLI
@@ -26,7 +29,7 @@ BHD_GET_IP:
 	POP	BX
 	SUB	BX,BHD_GET_IP-BHD_START
 	SHR	BX,4
-//Copy this bootloader code to just under 0x80000
+//This copies this bootloader's code to 0x$TX,"00096C00",D="DD_BOOT_HIGH_LOC_HD"$
 	MOV	AX,CS
 	ADD	AX,BX
 	MOV	DS,AX
@@ -35,21 +38,21 @@ BHD_GET_IP:
 	XOR	DI,DI
 	REP_MOVSB
 
-	MOV	AX,BOOT_HIGH_LOC
+	MOV	AX,BOOT_HIGH_LOC_HD
 	MOV	DS,AX
 
 //My assembler doesn't support 16-bit very well.
-	DU8	0xEA;	//JMP BOOT_HIGH_LOC:BHD_HISTART
-	DU16	BHD_HISTART-BHD_START,BOOT_HIGH_LOC;
+	DU8	0xEA;	//JMP BOOT_HIGH_LOC_HD:BHD_HISTART
+	DU16	BHD_HISTART-BHD_START,BOOT_HIGH_LOC_HD;
 
 BHD_BIOS_DRV_NUM: DU8	0;
 
-//Gets patched by $LK,"MakeOSPrtBootInstall",A="MN:MakeOSPrtBootInstall"$().
+//Gets patched by $LK,"MakeOSDrvBootInstall",A="MN:MakeOSDrvBootInstall"$().
 BHD_BLK_CNT::	DU16	0;
 
 BHD_DAP:	DU8	16,0,1,0; //One blk at a time
 BHD_DAP_BUF:	DU16	0,0;
-//Gets patched by $LK,"MakeOSPrtBootInstall",A="MN:MakeOSPrtBootInstall"$().
+//Gets patched by $LK,"MakeOSDrvBootInstall",A="MN:MakeOSDrvBootInstall"$().
 BHD_DAP_BLK::	//64-bit
 BHD_DAP_BLK_LO:	DU32	0;
 BHD_DAP_BLK_HI:	DU32	0;
@@ -82,7 +85,7 @@ BHD_HISTART:
 @@10:	POP	CX
 	LOOP	@@05
 
-	MOV	EBX,BOOT_CODE_HARDDRV //$MA-X+PU,"See sys_boot_code",LM="Grep(\"sys_boot_code\",\"/*\");View;\n"$
+	MOV	EBX,BOOT_SRC_HARDDRV //$MA-X+PU,"See sys_boot_src",LM="Find(\"sys_boot_src\",\"/*\");View;\n"$
 //My assembler doesn't support 16-bit very well.
 	DU8	0xEA;	//JMP BOOT_RAM_BASE:0000
 	DU16	0,BOOT_RAM_BASE/16;

Adam/Boot/BootIns.CPP

@@ -0,0 +1,233 @@
+//See $LK,"Install Documentation",A="FI:::/Doc/Install.TXT"$ or $LK,"Upgrading Documentation",A="FI:::/Doc/Upgrade.TXT"$.
+
+#help_index "Install"
+
+#define KERNEL_BIN_C	"Kernel.BIN.C"
+#define BOOT_DIR	"/0000Boot"
+#define BOOT_DIR_KERNEL_BIN_C	BOOT_DIR "/0000" KERNEL_BIN_C
+//Stage 2 of master boot loader
+#define BOOT_DIR_BOOTMHD2_BIN_C	BOOT_DIR "/BootMHD2.BIN.C"
+//Old master boot record
+#define BOOT_DIR_OLDMBR_BIN_C	BOOT_DIR "/OldMBR.BIN.C"
+
+public U0 MakeAll()
+{//Use $LK,"MakeOSDrvBootInstall",A="MN:MakeOSDrvBootInstall"$. Loader must be patched.
+//These 2 modules (and bootloaders at top) are the only AOT
+//compiled code in TempleOS.  Everything else is JIT.
+//You are doing it wrong if you make AOT compiled code.
+  if (Cmp("/Compiler/Compiler","Compiler",,':'))
+    throw;
+  if (Cmp("/Kernel/Kernel","Kernel",,':'))
+    throw;
+}
+
+public Bool MakeOSDrvBootInstall(U8 src_drv=0,U8 dst_drv=0)
+{// Does $LK,"MakeAll",A="MN:MakeAll"$ and installs new boot-loader.
+
+//Normally, you just supply a src_drv.	It will compile
+//the code on that drive and update the boot sect.
+
+//If you are making a bootable CD-ROM, you supply a dst_drv.
+//See $LK,"::/Misc/MakeDistro.CPP"$
+
+//See $LK,"Install Documentation",A="FI:::/Doc/Install.TXT"$
+
+//Study my account examples my technique: $LK,"Cfg Strs",A="FL:::/Demo/AcctExample/TOSCfg.CPP,1"$, $LK,"Update Funs",A="FL:::/Demo/AcctExample/TOSDistro.CPP,1"$
+
+  CBlkDev *bd;
+  CDrv *dv;
+  CFAT32Boot br;
+  CDirEntry de;
+  Bool result=FALSE;
+  I64 i;
+  try {
+    if (!src_drv) src_drv=Drv2Let(Fs->cur_dv);
+    if (!dst_drv) dst_drv=src_drv;
+    if (!Drv(src_drv))
+      throw;
+    MakeAll;
+    bd=Let2BlkDev(dst_drv);
+    dv=Let2Drv	 (dst_drv);
+    switch (bd->type) {
+      case BDT_ATAPI:
+	Move("/Kernel/Kernel.BIN.Z",BOOT_DIR_KERNEL_BIN_C);
+	result=TRUE;
+	break;
+      case BDT_RAM:
+      case BDT_ATA:
+	Move("/Kernel/Kernel.BIN.Z","/" KERNEL_BIN_C);
+	if (!FileFind("/" KERNEL_BIN_C,&de,FUF_JUST_FILES))
+	  "No Kernel.BIN.C\n";
+	else {
+	  Free(de.full_name);
+	  "Modifying partition boot record.\n";
+	  RBlks(dv,&br,dv->base_offset,1);
+	  br.jump_and_nop[0]=OC_JMP_REL8;
+	  br.jump_and_nop[1]=offset(CFAT32Boot.code)-2;
+#assert offset(CFAT32Boot.code)>=offset(CRedSeaBoot.code)
+	  br.jump_and_nop[2]=OC_NOP;
+	  *BHD_BLK_CNT(U16 *)=(de.size+BLK_SIZE-1)>>BLK_SIZE_BITS;
+	  *BHD_DAP_BLK(I64 *)=Cluster2Blk(dv,de.cluster);
+	  for (i=0;i<BHD_END-BHD_CODE;i++)
+	    br.code[i]=BHD_CODE(U8 *)[i];
+#assert sizeof(CFAT32Boot.code)>=BHD_END-BHD_CODE
+	  for (;i<sizeof(CFAT32Boot.code);i++)
+	    br.code[i]=0;
+	  WBlks(dv,&br,dv->base_offset,1);
+	  result=TRUE;
+	}
+	break;
+    }
+  } catch {
+    PutExcept;
+    Beep;
+  }
+  return result;
+}
+
+public U0 MasterBootOldRead(U8 src_drv,U8 dst_drv)
+{//Reads MBR from disk drive containing src partition.
+ //Writes a single blk file to dst /0000Boot directory.
+  CBlkDev *bd=Let2BlkDev(src_drv);
+  CDrv *dv;
+  CMasterBoot mbr;
+  Drv(dst_drv);
+  dv=Fs->cur_dv;
+  if (dv->type!=DVT_REDSEA && dv->type!=DVT_FAT32)
+    PrintErr("Not RedSea Drv\n");
+  else {
+    //Bypass partition bounds-checking
+    BlkDevLock(bd);
+    ATAReadBlks(bd,&mbr,0,1);
+    BlkDevUnlock(bd);
+
+    Drv(dst_drv);
+    MkDir(BOOT_DIR);
+    FileWrite(BOOT_DIR_OLDMBR_BIN_C,&mbr,BLK_SIZE);
+  }
+}
+
+public U0 MasterBootOldWrite(U8 src_drv,U8 dst_drv)
+{//Reads OldMBR from src drive /0000Boot directory
+  //writes it to the MBR of the drive with dst partition.
+  CBlkDev *bd=Let2BlkDev(dst_drv);
+  CMasterBoot *mbr;
+  Drv(src_drv);
+  if (mbr=FileRead(BOOT_DIR_OLDMBR_BIN_C)) {
+    //Bypass partition bounds-checking
+    BlkDevLock(bd);
+    ATAWriteBlks(bd,mbr,0,1);
+    BlkDevUnlock(bd);
+  }
+  Free(mbr);
+}
+
+public U0 MasterBootZero(U8 dst_drv)
+{//Set MBR of disk with dst partition to zero.
+
+//This is dangerous!!
+//The TempleOS partitioner doesn't play well
+//with other operating systems at this time and you need
+//to do this on a drive partitioned by TempleOS
+//if you wish to partition with another operating system.
+  CBlkDev *bd=Let2BlkDev(dst_drv);
+  CMasterBoot mbr;
+  MemSet(&mbr,0,BLK_SIZE);
+  //Bypass partition bounds-checking
+  BlkDevLock(bd);
+  ATAWriteBlks(bd,&mbr,0,1);
+  BlkDevUnlock(bd);
+}
+
+public Bool MasterBootIntall(U8 drv_let,U8 *drv_lst=NULL)
+{//Create new MBR on the disk that has drv_let as a partition.
+  //Puts stage 2 in /0000Boot dir of drv_let.
+  CBlkDev *bd,*bd1;
+  CDrv *dv,*p1;
+  CMasterBoot mbr;
+  CDirEntry de;
+  I64 i,j,size,*_q;
+  U8 *menu_ptr,*ptr,ch,buf[128];
+  Bool result=FALSE;
+
+  try {
+    if (drv_lst)
+      StrCpy(buf,drv_lst);
+    else {
+      j=0;
+      for (i='A';i<='Z';i++)
+	buf[j++]=i;
+      buf[j++]=0;
+    }
+
+    Drv(drv_let);
+    dv=Fs->cur_dv;
+    if (dv->type!=DVT_REDSEA && dv->type!=DVT_FAT32)
+      PrintErr("Not RedSea Drv\n");
+    else {
+      bd=Let2BlkDev(drv_let);
+      if (!FileFind(BOOT_DIR_OLDMBR_BIN_C,,FUF_JUST_FILES))
+	MasterBootOldRead(drv_let,drv_let);
+
+      _q=BMHD2_BLK_ARRAY;
+      MemSet(_q,0,sizeof(I64)*8);
+      menu_ptr=BMHD2_BOOT_MSG;
+      StrPrint(menu_ptr,"\n\r\n\rTempleOS Boot Loader\n\r\n\r");
+      j=0;
+      if (FileFind(BOOT_DIR_OLDMBR_BIN_C,&de,FUF_JUST_FILES)) {
+	Free(de.full_name);
+	*_q++=Cluster2Blk(dv,de.cluster);
+	CatPrint(menu_ptr,"0. Old Boot Record\n\r");
+	j++;
+      }
+
+      ptr=buf;
+      while (ch=*ptr++) {
+	try {
+	  p1 =Let2Drv(ch);
+	  bd1=Let2BlkDev(ch);
+	} catch {
+	  Fs->catch_except=TRUE;
+	  p1 =NULL;
+	  bd1=NULL;
+	}
+	if (p1 && bd1==bd) {
+	  *_q=p1->base_offset;
+	  "Drive %C:%16X\n",Drv2Let(p1),*_q;
+	  CatPrint(menu_ptr,"%d. Drive %C\n\r",j++,Drv2Let(p1));
+	  _q++;
+	}
+      }
+      CatPrint(menu_ptr,"\n\rSelection:");
+
+      size=BMHD2_END-BMHD2_START;
+      FileWrite(BOOT_DIR_BOOTMHD2_BIN_C,BMHD2_START,size);
+
+      if (!FileFind(BOOT_DIR_BOOTMHD2_BIN_C,&de,FUF_JUST_FILES))
+	"No Boot Loader Image\n";
+      else {
+	Free(de.full_name);
+	*BMHD_BLK_CNT(U16 *)=(size+BLK_SIZE-1)>>BLK_SIZE_BITS;
+	*BMHD_DAP_BLK(I64 *)=Cluster2Blk(dv,de.cluster);
+	//Bypass partition bounds-checking
+	BlkDevLock(bd);
+	ATAReadBlks(bd,&mbr,0,1);
+	for (i=0;i<BMHD_END-BMHD_CODE;i++)
+	  mbr.code[i]=BMHD_CODE(U8 *)[i];
+#assert sizeof(CMasterBoot.code)>=BMHD_END-BMHD_CODE
+	for (;i<sizeof(CMasterBoot.code);i++)
+	  mbr.code[i]=0;
+	if (!mbr.media_id)
+	  mbr.media_id=RandU32;
+	mbr.zero=0;
+	mbr.signature=0xAA55;
+
+	ATAWriteBlks(bd,&mbr,0,1);
+	BlkDevUnlock(bd);
+	result=TRUE;
+      }
+    }
+  } catch
+    PutExcept;
+  return result;
+}

Adam/Boot/BootMHD.CPP

@@ -1,5 +1,8 @@
 #define MODULE_SIZE		1*BLK_SIZE
-#define BOOT_HIGH_LOC	((BOOT_RAM_LIMIT-(BOOT_STK_SIZE+MODULE_SIZE))>>4)
+#define BOOT_HIGH_LOC_MHD	((BOOT_RAM_LIMIT-(BOOT_STK_SIZE+MODULE_SIZE))>>4)
+
+DefinePrint(
+  "DD_BOOT_HIGH_LOC_MHD","%08X",BOOT_HIGH_LOC_MHD<<4);
 
 asm {
 USE16
@@ -7,7 +10,7 @@ BMHD_START::
 BMHD_CODE::
 	CLD
 
-	MOV	AX,BOOT_HIGH_LOC
+	MOV	AX,BOOT_HIGH_LOC_MHD
 
 	CLI
 	MOV	SS,AX
@@ -26,7 +29,7 @@ BMHD_CODE::
 
 	MOV	ES,AX
 
-	MOV	AX,VGA_TEXT_MEM_BASE/16
+	MOV	AX,VGAM_TEXT/16
 	MOV	FS,AX
 	MOV	U32 FS:[0],'B'+GREEN<<12+('1'+GREEN<<12)<<16
 	CALL	BMHD_GET_IP
@@ -35,7 +38,7 @@ BMHD_GET_IP:
 	SUB	BX,BMHD_GET_IP-BMHD_START
 	MOV	CX,BX
 	SHR	BX,4
-//Copy this bootloader code to just under 0x80000
+//This copies this bootloader's code to 0x$TX,"00096C00",D="DD_BOOT_HIGH_LOC_MHD"$
 	MOV	AX,CS
 	PUSH	AX
 	ADD	AX,BX
@@ -48,21 +51,21 @@ BMHD_GET_IP:
 	XOR	DI,DI
 	REP_MOVSB
 
-	MOV	AX,BOOT_HIGH_LOC
+	MOV	AX,BOOT_HIGH_LOC_MHD
 	MOV	DS,AX
 
 //My assembler doesn't support 16-bit very well.
-	DU8	0xEA;	//JMP BOOT_HIGH_LOC:BMHD_HISTART
-	DU16	BMHD_HISTART-BMHD_START,BOOT_HIGH_LOC;
+	DU8	0xEA;	//JMP BOOT_HIGH_LOC_MHD:BMHD_HISTART
+	DU16	BMHD_HISTART-BMHD_START,BOOT_HIGH_LOC_MHD;
 
 BMHD_BIOS_DRV_NUM:	DU8	0;
 BMHD_OLD_CS_IP:		DU16	0,0;
-//Gets patched by $LK,"MakeOSPrtBootInstall",A="MN:MakeOSPrtBootInstall"$().
+//Gets patched by $LK,"MakeOSDrvBootInstall",A="MN:MakeOSDrvBootInstall"$().
 BMHD_BLK_CNT::		DU16	0;
 
 BMHD_DAP:		DU8	16,0,1,0; //One blk at a time
 BMHD_DAP_BUF:		DU16	0,0;
-//Gets patched by $LK,"MakeOSPrtBootInstall",A="MN:MakeOSPrtBootInstall"$().
+//Gets patched by $LK,"MakeOSDrvBootInstall",A="MN:MakeOSDrvBootInstall"$().
 BMHD_DAP_BLK::	//64-bit
 BMHD_DAP_BLK_LO:	DU32	0;
 BMHD_DAP_BLK_HI:	DU32	0;

Adam/Boot/BootMHD2.CPP

@@ -1,14 +1,17 @@
 #define MODULE_SIZE		2*BLK_SIZE
-#define BOOT_HIGH_LOC	((BOOT_RAM_LIMIT-(BOOT_STK_SIZE+MODULE_SIZE))>>4)
+#define BOOT_HIGH_LOC_MHD2	((BOOT_RAM_LIMIT-(BOOT_STK_SIZE+MODULE_SIZE))>>4)
+
+DefinePrint(
+  "DD_BOOT_HIGH_LOC_MHD2","%08X",BOOT_HIGH_LOC_MHD2<<4);
 
 asm {
 USE16
 BMHD2_START::
 	MOV	U32 FS:[0],'B'+0x2000+('2'+0x2000)<<16
 
-	MOV	AX,BOOT_HIGH_LOC
+	MOV	AX,BOOT_HIGH_LOC_MHD2
 	MOV	ES,AX
-//Copy this bootloader code to just under 0x80000
+//This copies this bootloader's code to 0x$TX,"00096A00",D="DD_BOOT_HIGH_LOC_MHD2"$
 	MOV	AX,CS
 	MOV	DS,AX
 	MOV	U32 [BMHD2_OLD_CS_IP-BMHD2_START],EBX
@@ -19,12 +22,12 @@ BMHD2_START::
 	XOR	DI,DI
 	REP_MOVSB
 
-	MOV	AX,BOOT_HIGH_LOC
+	MOV	AX,BOOT_HIGH_LOC_MHD2
 	MOV	DS,AX
 
 //My assembler doesn't support 16-bit very well.
-	DU8	0xEA;	//JMP BOOT_HIGH_LOC:BMHD2_HISTART
-	DU16	BMHD2_HISTART-BMHD2_START,BOOT_HIGH_LOC;
+	DU8	0xEA;	//JMP BOOT_HIGH_LOC_MHD2:BMHD2_HISTART
+	DU16	BMHD2_HISTART-BMHD2_START,BOOT_HIGH_LOC_MHD2;
 
 BMHD2_BOOT_MSG::
 	DU8	256 DUP(0);

Adam/Boot/InsBoot.CPP

@@ -1,346 +0,0 @@
-#help_index "Install"
-//See $LK,"Install Documentation",A="FI:::/Doc/Install.TXT"$ or $LK,"Upgrading Documentation",A="FI:::/Doc/Upgrade.TXT"$.
-
-//Kernel module: Kernel.BIN.Z
-#define KERNEL_BIN_C	"Kernel.BIN.C"
-
-#define BOOT_DIR	"/0000Boot"
-#define BOOT_DIR_KERNEL_BIN_C BOOT_DIR "/0000" KERNEL_BIN_C
-
-//Stage 2 of master boot loader
-#define BOOTMHD2_BIN_C	BOOT_DIR "/BootMHD2.BIN.C"
-
-//Old master boot record
-#define OLDMBR_BIN_C	BOOT_DIR "/OldMBR.BIN.C"
-
-if (IsDrvWritable)
-  MkDir("/Temp"); //Good to have a Temp
-
-#include "BootCD"
-#include "BootHD"
-#include "BootMHD"
-#include "BootMHD2"
-#include "DskCDDVD"
-
-#help_index "Call"
-asm {
-USE64
-_HI_CALL::
-	PUSH	RBP
-	MOV	RBP,RSP
-	MOV	RAX,U64 16[RBP]
-	TEST	RAX,RAX
-	JZ	@@05
-	CALL	RAX
-@@05:	POP	RBP
-	RET1	8
-//************************************
-_HI_MEMCPY::
-	PUSH	RBP
-	MOV	RBP,RSP
-	PUSH	RSI
-	PUSH	RDI
-	CLD
-	MOV	RDI,U64 SF_ARG1[RBP]
-	MOV	RSI,U64 SF_ARG2[RBP]
-	MOV	RCX,U64 SF_ARG3[RBP]
-	REP_MOVSB
-	MOV	RAX,RDI
-	POP	RDI
-	POP	RSI
-	POP	RBP
-	RET1	24
-}
-_extern _HI_CALL I64 HiCall(U8 *s);
-_extern _HI_MEMCPY U8 *HiMemCpy(U8 *dst,U8 *src,I64 cnt);
-
-#help_index "Boot"
-public U0 SoftBoot(U8 *filename)
-{//Softboot Kernel Bin file. No hardware reset.
-  I64 size;
-  CKernel	*hi_image,*lo_image=sys_boot_base-sizeof(CBinFile),
-		reg *shutdown,*hi_image2;
-
-  if (!(hi_image2=FileRead(filename,&size))) return;
-  shutdown=MAlloc(SYS_RESTART_KERNEL_END-SYS_RESTART_KERNEL,Fs->code_heap);
-  hi_image=MAlloc(size,Fs->code_heap);
-  HiMemCpy(hi_image,hi_image2,size);
-  Free(hi_image2);
-
-  hi_image->boot_base=lo_image(U8 *)+sizeof(CBinFile);
-  hi_image->boot_patch_table_base=lo_image(U8 *)+hi_image->h.patch_table_offset;
-  HiMemCpy(&hi_image->sys_mem_E801,&lo_image->sys_mem_E801,2*2);
-  HiMemCpy(&hi_image->sys_mem_E820,&lo_image->sys_mem_E820,MEM_NUM_E820_ENTRIES*MEM_E820_ENTRY_SIZE);
-  hi_image->sys_gr_mode=lo_image->sys_gr_mode;
-  hi_image->sys_pci_busses=lo_image->sys_pci_busses;
-  hi_image->boot_code=BOOT_CODE_RAM;
-
-  CLI
-  if (mp_cnt>1)
-    MPHalt;
-
-  HiMemCpy(shutdown,SYS_RESTART_KERNEL,SYS_RESTART_KERNEL_END-SYS_RESTART_KERNEL);
-  HiMemCpy(&hi_image->sys_gdt,&lo_image->sys_gdt,sizeof(CGDT));
-  HiMemCpy(lo_image,hi_image,size);
-  HiCall(shutdown);
-}
-
-#help_index "Install"
-U8 ChkWritable(U8 drv_let=0)
-{
-  Bool cont=TRUE;
-  I64 writable_drv=drv_let;
-  U8 buf_s[136],buf_d[136];
-  CPrt *p;
-  CBlkDev *bdev;
-  if (!IsDrvWritable(drv_let)) {
-    '' drv_let;
-    ": Drive is read-only.\n";
-    do {
-      "Enter RAM drive (usually 'B') for temporary files:";
-      writable_drv=ToUpper(GetChar);
-      '\n';
-      p=Drv2Prt(writable_drv);
-      bdev=p->bdev;
-      if (bdev->type!=BDT_RAM ||
-	  !IsDrvWritable(writable_drv))
-	"Not A RAM Drive\n";
-      else
-	cont=FALSE;
-    } while (cont);
-    if (drv_let!=writable_drv) {
-      Fmt(writable_drv,FALSE,FALSE);
-      StrPrint(buf_s,"%c:/",drv_let);
-      StrPrint(buf_d,"%c:/",writable_drv);
-      CopyTree(buf_s,buf_d);
-    }
-  }
-  return writable_drv;
-}
-
-#help_index "Install"
-public U0 MakeAll()
-{//Use $LK,"MakeOSPrtBootInstall",A="MN:MakeOSPrtBootInstall"$. Loader must be patched.
-//These 2 modules (and bootloaders at top) are the only AOT
-//compiled code in TempleOS.  Everything else is JIT.
-//You are doing it wrong if you make AOT compiled code.
-  Cd("/Compiler");
-  if (Cmp("Compiler","Compiler",,':'))
-    throw;
-  Cd("/Kernel");
-  if (Cmp("Kernel","Kernel",,':'))
-    throw;
-}
-
-public Bool MakeOSPrtBootInstall(U8 src_drv=0,U8 dst_drv=0)
-{// Does $LK,"MakeAll",A="MN:MakeAll"$ and installs new boot-loader.
-
-//Normally, you just supply a src_drv.	It will compile
-//the code on that drive and update the boot sect.
-
-//If you are making a bootable CD-ROM, you supply a dst_drv.
-//See $LK,"::/Misc/MakeDistro.CPP"$
-
-//See $LK,"Install Documentation",A="FI:::/Doc/Install.TXT"$
-
-//Study my account examples my technique: $LK,"Cfg Strs",A="FL:::/Demo/AcctExample/TSAdam.CPP,1"$ $LK,"Update Funs",A="FL:::/Demo/AcctExample/TSDistro.CPP,1"$
-
-  CBlkDev *bdev;
-  CPrt *p;
-  CFAT32Boot br;
-  CDirEntry de;
-  Bool result=FALSE;
-  I64 i;
-
-  try {
-    if (!src_drv) src_drv=Fs->cur_prt->drv_let;
-    if (!dst_drv) dst_drv=src_drv;
-
-    src_drv=ChkWritable(src_drv);
-    if (!Drv(src_drv))
-      throw;
-    MakeAll;
-    Cd("/");
-
-    bdev=Drv2BlkDev(dst_drv);
-    p	=Drv2Prt   (dst_drv);
-    switch (bdev->type) {
-      case BDT_ATAPI:
-	Move("/Kernel/Kernel.BIN.Z",BOOT_DIR_KERNEL_BIN_C);
-	result=TRUE;
-	break;
-      case BDT_RAM:
-      case BDT_ATA:
-	Move("/Kernel/Kernel.BIN.Z",KERNEL_BIN_C);
-	if (!FileFind(KERNEL_BIN_C,&de,FUF_JUST_FILES))
-	  "No Kernel.BIN.C\n";
-	else {
-	  Free(de.full_name);
-	  "Modifying partition boot record.\n";
-	  RBlks(p,&br,p->offset,1);
-	  br.jump_and_nop[0]=OC_JMP_REL8;
-	  br.jump_and_nop[1]=offset(CFAT32Boot.code)-2;
-	  br.jump_and_nop[2]=OC_NOP;
-	  *BHD_BLK_CNT(U16 *)=(de.size+BLK_SIZE-1)>>BLK_SIZE_BITS;
-	  *BHD_DAP_BLK(I64 *)=p->data+de.cluster*p->spc;
-	  for (i=0;i<BHD_END-BHD_CODE;i++)
-	    br.code[i]=BHD_CODE(U8 *)[i];
-	  for (;i<420;i++)
-	    br.code[i]=0;
-	  WBlks(p,&br,p->offset,1);
-	  result=TRUE;
-	}
-	break;
-    }
-  } catch {
-    PutExcept;
-    Beep;
-  }
-  return result;
-}
-
-public U0 MasterBootOldRead(U8 src_drv,U8 dst_drv)
-{//Reads MBR from disk drive containing src partition.
- //Writes a single blk file to dst /0000Boot directory.
-  CBlkDev *bdev=Drv2BlkDev(src_drv);
-  CPrt *p;
-  CMasterBoot mbr;
-  Drv(dst_drv);
-  p=Fs->cur_prt;
-  if (p->type!=PT_REDSEA && p->type!=PT_FAT32)
-    PrintErr("Not RedSea Partition\n");
-  else {
-    //Bypass partition bounds-checking
-    BlkDevLock(bdev);
-    ATAReadBlks(bdev,&mbr,0,1);
-    BlkDevUnlock(bdev);
-
-    Drv(dst_drv);
-    MkDir(BOOT_DIR);
-    FileWrite(OLDMBR_BIN_C,&mbr,BLK_SIZE);
-  }
-}
-
-public U0 MasterBootOldWrite(U8 src_drv,U8 dst_drv)
-{//Reads OldMBR from src drive /0000Boot directory
-  //writes it to the MBR of the drive with dst partition.
-  CBlkDev *bdev=Drv2BlkDev(dst_drv);
-  CMasterBoot *mbr;
-  Drv(src_drv);
-  if (mbr=FileRead(OLDMBR_BIN_C)) {
-    //Bypass partition bounds-checking
-    BlkDevLock(bdev);
-    ATAWriteBlks(bdev,mbr,0,1);
-    BlkDevUnlock(bdev);
-  }
-  Free(mbr);
-}
-
-public U0 MasterBootZero(U8 dst_drv)
-{//Set MBR of disk with dst partition to zero.
-
-//This is dangerous!!
-//The TempleOS partitioner doesn't play well
-//with other operating systems at this time and you need
-//to do this on a drive partitioned by TempleOS
-//if you wish to partition with another operating system.
-  CBlkDev *bdev=Drv2BlkDev(dst_drv);
-  CMasterBoot mbr;
-  MemSet(&mbr,0,BLK_SIZE);
-  //Bypass partition bounds-checking
-  BlkDevLock(bdev);
-  ATAWriteBlks(bdev,&mbr,0,1);
-  BlkDevUnlock(bdev);
-}
-
-public Bool MasterBootIntall(U8 drv_let,U8 *drv_lst=NULL)
-{//Create new MBR on the disk that has drv_let as a partition.
-  //Puts stage 2 in /0000Boot dir of drv_let.
-  CBlkDev *bdev,*bdev1;
-  CPrt *p,*p1;
-  CMasterBoot mbr;
-  CDirEntry de;
-  I64 i,j,size,*_q;
-  U8 *menu_ptr,*ptr,ch,buf[128];
-  Bool result=FALSE;
-
-  try {
-    if (drv_lst)
-      StrCpy(buf,drv_lst);
-    else {
-      j=0;
-      for (i='A';i<='Z';i++)
-	buf[j++]=i;
-      buf[j++]=0;
-    }
-
-    Drv(drv_let);
-    p=Fs->cur_prt;
-    if (p->type!=PT_REDSEA && p->type!=PT_FAT32)
-      PrintErr("Not RedSea Partition\n");
-    else {
-      bdev=Drv2BlkDev(drv_let);
-      if (!FileFind(OLDMBR_BIN_C,,FUF_JUST_FILES))
-	MasterBootOldRead(drv_let,drv_let);
-
-      _q=BMHD2_BLK_ARRAY;
-      MemSet(_q,0,sizeof(I64)*8);
-      menu_ptr=BMHD2_BOOT_MSG;
-      StrPrint(menu_ptr,"\n\r\n\rTempleOS Boot Loader\n\r\n\r");
-      j=0;
-      if (FileFind(OLDMBR_BIN_C,&de,FUF_JUST_FILES)) {
-	Free(de.full_name);
-	*_q++=p->data+de.cluster*p->spc;
-	CatPrint(menu_ptr,"0. Old Boot Record\n\r");
-	j++;
-      }
-
-      ptr=buf;
-      while (ch=*ptr++) {
-	try {
-	  p1 =Drv2Prt(ch);
-	  bdev1=Drv2BlkDev(ch);
-	} catch {
-	  Fs->catch_except=TRUE;
-	  p1 =NULL;
-	  bdev1=NULL;
-	}
-	if (p1 && bdev1==bdev) {
-	  *_q=p1->offset;
-	  "Drive %C:%16X\n",Prt2Drv(p1),*_q;
-	  CatPrint(menu_ptr,"%d. Drive %C\n\r",j++,Prt2Drv(p1));
-	  _q++;
-	}
-      }
-      CatPrint(menu_ptr,"\n\rSelection:");
-
-      size=BMHD2_END-BMHD2_START;
-      FileWrite(BOOTMHD2_BIN_C,BMHD2_START,size);
-
-      if (!FileFind(BOOTMHD2_BIN_C,&de,FUF_JUST_FILES))
-	"No Boot Loader Image\n";
-      else {
-	Free(de.full_name);
-	*BMHD_BLK_CNT(U16 *)=(size+BLK_SIZE-1)>>BLK_SIZE_BITS;
-	*BMHD_DAP_BLK(I64 *)=p->data+de.cluster*p->spc;
-	//Bypass partition bounds-checking
-	BlkDevLock(bdev);
-	ATAReadBlks(bdev,&mbr,0,1);
-	for (i=0;i<BMHD_END-BMHD_CODE;i++)
-	  mbr.boot_code[i]=BMHD_CODE(U8 *)[i];
-	for (;i<440;i++)
-	  mbr.boot_code[i]=0;
-	if (!mbr.media_id)
-	  mbr.media_id=RandU32;
-	mbr.zero=0;
-	mbr.signature=0xAA55;
-
-	ATAWriteBlks(bdev,&mbr,0,1);
-	BlkDevUnlock(bdev);
-	result=TRUE;
-      }
-    }
-  } catch
-    PutExcept;
-  return result;
-}