--- np2/bios/bios.c 2003/11/14 10:04:56 1.4 +++ np2/bios/bios.c 2003/12/10 13:52:57 1.13 @@ -1,6 +1,6 @@ #include "compiler.h" #include "dosio.h" -#include "i286.h" +#include "cpucore.h" #include "memory.h" #include "pccore.h" #include "iocore.h" @@ -14,6 +14,7 @@ #include "fdfmt.h" #include "keytable.res" #include "itfrom.res" +#include "startup.res" BOOL biosrom = FALSE; @@ -25,22 +26,6 @@ static const char neccheck[] = "Copyrigh // 00/05/18 MS-DOS6.2 on PC-9801VX calling proc static const BYTE printmain[] = {0x90, 0x5a, 0x1f, 0xcf}; -static const BYTE nosyscode[] = { - 0xeb,0x05,0xbe,0x6f,0x00,0xeb,0x03,0xbe,0x47,0x00,0xb8,0x00, - 0x10,0xbb,0x00,0x80,0x8e,0xd0,0x8b,0xe3,0x8c,0xc8,0x8e,0xd8, - 0xb8,0x00,0xa0,0x8e,0xc0,0xb9,0x00,0x10,0xb8,0x20,0x00,0x33, - 0xff,0xfc,0xf3,0xab,0xb0,0xe1,0xb9,0xe0,0x1f,0xaa,0x47,0xe2, - 0xfc,0x2e,0xad,0x8b,0xf8,0x2e,0xad,0x85,0xc0,0x74,0x0a,0xab, - 0x0a,0xe4,0x74,0xf5,0x83,0xc7,0x02,0xeb,0xf0,0xeb,0xfe,0xac, - 0x07,0x05,0x37,0x05,0x39,0x05,0x46,0x05,0x60,0x05,0x47,0x05, - 0x23,0x05,0x39,0x05,0x2f,0x04,0x72,0x05,0x3b,0x05,0x43,0x05, - 0x48,0x04,0x37,0x04,0x46,0x04,0x2f,0x04,0x40,0x04,0x35,0x04, - 0x24,0x00,0x00,0xae,0x07,0x42,0x00,0x41,0x00,0x53,0x00,0x49, - 0x00,0x43,0x00,0x04,0x4e,0x15,0x2f,0x26,0x30,0x04,0x4b,0x04, - 0x4f,0x20,0x00,0x42,0x00,0x49,0x00,0x4f,0x00,0x53,0x00,0x2e, - 0x00,0x52,0x00,0x4f,0x00,0x4d,0x00,0x04,0x2c,0x29,0x2c,0x2d, - 0x57,0x04,0x47,0x04,0x39,0x00,0x00}; - static void bios_reinitbyswitch(void) { @@ -49,7 +34,7 @@ static void bios_reinitbyswitch(void) { BYTE biosflag; BYTE ext_mem; - CPUTYPE = 0; + CPU_TYPE = 0; prxcrt = 0xc8; if (gdc.display & 2) { prxcrt |= 0x04; // color16 @@ -80,7 +65,7 @@ static void bios_reinitbyswitch(void) { ext_mem = np2cfg.EXTMEM; // ver0.28 } else { - CPUTYPE = CPUTYPE_V30; + CPU_TYPE = CPUTYPE_V30; ext_mem = 0; biosflag |= 0x40; } @@ -97,7 +82,7 @@ static void bios_reinitbyswitch(void) { } gdcs.textdisp |= GDCSCRN_EXT; - if ((np2cfg.model >= PCMODEL_VX) && (usesound & 0x7e)) { + if ((pc.model >= PCMODEL_VX) && (usesound & 0x7e)) { iocore_out8(0x188, 0x27); iocore_out8(0x18a, 0x3f); } @@ -135,6 +120,7 @@ static const UINT16 biosoffset[0x20] = { void bios_init(void) { + char path[MAX_PATH]; FILEH fh; UINT i; UINT pos; @@ -143,7 +129,8 @@ void bios_init(void) { // まぁDISK BASIC動くようになるからいいんじゃないですか？ // BASIC BIOSは 8086コードのように見えるけど… - fh = file_open_c(file_biosrom); + getbiospath(path, file_biosrom, sizeof(path)); + fh = file_open_rb(path); if (fh != FILEH_INVALID) { if (file_read(fh, mem + 0x0e8000, 0x18000) == 0x18000) { biosrom = TRUE; @@ -154,8 +141,6 @@ void bios_init(void) { CopyMemory(mem + 0x0e8000, nosyscode, sizeof(nosyscode)); } - itf.bank = 0; - // BIOS hookのアドレス変更 for (i=0; i<0x20; i++) { STOREINTELWORD(mem + 0xfd868 + i*2, biosoffset[i]); @@ -231,18 +216,19 @@ static void bios_boot(void) { if (!(sysport.c & 0x20)) { bios_reinitbyswitch(); } - I286_CS = 0x0000; - I286_IP = 0x04f8; - I286_DS = 0x0000; - I286_DX = 0x43d; - I286_AL = 0x10; + CPU_CS = 0x0000; + CPU_IP = 0x04f8; + CPU_DS = 0x0000; + CPU_DX = 0x43d; + CPU_AL = 0x10; mem[0x004f8] = 0xee; // out dx, al mem[0x004f9] = 0xea; // call far - SETBIOSMEM32(0x004fa, 0xffff0000); + SETBIOSMEM16(0x004fa, 0x0000); + SETBIOSMEM16(0x004fc, 0xffff); } else { - I286_SP = GETBIOSMEM16(0x00404); - I286_SS = GETBIOSMEM16(0x00406); + CPU_SP = GETBIOSMEM16(0x00404); + CPU_SS = GETBIOSMEM16(0x00406); } } @@ -251,15 +237,15 @@ UINT MEMCALL biosfunc(UINT32 adrs) { UINT16 bootseg; - if ((itf.bank) && (adrs >= 0xf8000) && (adrs < 0x100000)) { - I286_IP--; - I286_REMCLOCK = -1; + if ((CPU_ITFBANK) && (adrs >= 0xf8000) && (adrs < 0x100000)) { + CPU_IP--; + CPU_REMCLOCK = -1; return(1); } switch(adrs) { // ver0.30 case BIOS_BASE + BIOSOFST_EOIM: - I286_REMCLOCK -= 300; + CPU_REMCLOCK -= 300; iocore_out8(0x00, 0x20); return(0); @@ -271,78 +257,78 @@ UINT MEMCALL biosfunc(UINT32 adrs) { return(0); case BIOS_BASE + BIOSOFST_02: - I286_REMCLOCK -= 300; + CPU_REMCLOCK -= 300; bios0x02(); return(1); case BIOS_BASE + BIOSOFST_08: - I286_REMCLOCK -= 300; + CPU_REMCLOCK -= 300; bios0x08(); return(1); case BIOS_BASE + BIOSOFST_09: - I286_REMCLOCK -= 300; + CPU_REMCLOCK -= 300; bios0x09(); return(1); case BIOS_BASE + BIOSOFST_0c: - I286_REMCLOCK -= 500; + CPU_REMCLOCK -= 500; bios0x0c(); return(1); case BIOS_BASE + BIOSOFST_12: - I286_REMCLOCK -= 500; + CPU_REMCLOCK -= 500; bios0x12(); return(1); case BIOS_BASE + BIOSOFST_13: - I286_REMCLOCK -= 500; + CPU_REMCLOCK -= 500; bios0x13(); return(1); case BIOS_BASE + BIOSOFST_18: - I286_REMCLOCK -= 200; + CPU_REMCLOCK -= 200; bios0x18(); return(1); case BIOS_BASE + BIOSOFST_19: - I286_REMCLOCK -= 200; + CPU_REMCLOCK -= 200; bios0x19(); return(1); case BIOS_BASE + BIOSOFST_1a: - I286_REMCLOCK -= 200; + CPU_REMCLOCK -= 200; bios0x1a(); return(1); case BIOS_BASE + BIOSOFST_1b: - I286_REMCLOCK -= 200; + CPU_REMCLOCK -= 200; bios0x1b(); return(1); case BIOS_BASE + BIOSOFST_1c: - I286_REMCLOCK -= 200; + CPU_REMCLOCK -= 200; bios0x1c(); return(1); case BIOS_BASE + BIOSOFST_WAIT: - I286_STI; + CPU_STI; if (fddmtr_biosbusy) { // ver0.26 - I286_IP--; - I286_REMCLOCK = -1; + CPU_IP--; + CPU_REMCLOCK = -1; } else { switch(CTRL_FDMEDIA) { case DISKTYPE_2HD: if (pic.pi[1].isr & PIC_INT42) { - I286_IP--; - I286_REMCLOCK -= 1000; + CPU_IP--; + CPU_REMCLOCK -= 1000; } break; case DISKTYPE_2DD: if (pic.pi[1].isr & PIC_INT41) { - I286_IP--; - I286_REMCLOCK -= 1000; + CPU_IP--; + CPU_REMCLOCK -= 1000; } break; } @@ -361,29 +347,29 @@ UINT MEMCALL biosfunc(UINT32 adrs) { bios_reinitbyswitch(); // ver0.27 bios_vectorset(); // ver0.29 bootseg = bootstrapload(); - I286_STI; - I286_CS = (bootseg != 0)?bootseg:0xe800; - I286_DS = 0x0000; - I286_SS = 0x0030; - I286_SP = 0x00e6; - I286_IP = 0x0000; + CPU_STI; + CPU_CS = (bootseg != 0)?bootseg:0xe800; + CPU_DS = 0x0000; + CPU_SS = 0x0030; + CPU_SP = 0x00e6; + CPU_IP = 0x0000; return(1); case 0xfffe8: // ブートストラップロード - I286_REMCLOCK -= 2000; + CPU_REMCLOCK -= 2000; bootseg = bootstrapload(); if (bootseg) { - I286_STI; - I286_CS = bootseg; - I286_IP = 0x0000; - I286_SS = 0x0030; - I286_SP = 0x00e6; + CPU_STI; + CPU_CS = bootseg; + CPU_IP = 0x0000; + CPU_SS = 0x0030; + CPU_SP = 0x00e6; return(1); } return(0); case 0xfffec: - I286_REMCLOCK -= 2000; + CPU_REMCLOCK -= 2000; bootstrapload(); return(0); } @@ -398,8 +384,8 @@ UINT MEMCALL biosfunc(UINT32 adrs) { if (biosrom) { return(0); } - I286_IP--; - I286_REMCLOCK = -1; + CPU_IP--; + CPU_REMCLOCK = -1; return(1); }