Firebee/BaS_gcc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add some diagnostic output for debugging

Browse Source
This commit is contained in:
Markus Fröschle
2016-10-17 05:45:54 +00:00
parent cb31dffa64
commit 12c99a1840
2 changed files with 92 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

124
x86emu/x86biosemu.c
View File

@@ -10,7 +10,7 @@
#include "pci_ids.h" #include "pci_ids.h"
#include "x86pcibios.h" #include "x86pcibios.h"
// #define DEBUG #define DEBUG
#include "debug.h" #include "debug.h"
#define USE_SDRAM #define USE_SDRAM
@@ -30,17 +30,6 @@
#define SIZE_EMU 0x100000 #define SIZE_EMU 0x100000
typedef struct
{
long ident;
union
{
long l;
short i[2];
char c[4];
} v;
} COOKIE;
struct rom_header struct rom_header
{ {
uint16_t signature; uint16_t signature;
@@ -73,22 +62,21 @@ uint32_t offset_mem;
static uint32_t offset_io; static uint32_t offset_io;
static uint32_t config_address_reg; static uint32_t config_address_reg;
//X86EMU_sysEnv _X86EMU_env;
/* general software interrupt handler */ /* general software interrupt handler */
uint32_t getIntVect(struct X86EMU *emu, int num) static uint32_t getIntVect(struct X86EMU *emu, int num)
{ {
return MEM_RW(num << 2) + (MEM_RW((num << 2) + 2) << 4); return MEM_RW(num << 2) + (MEM_RW((num << 2) + 2) << 4);
} }
/* FixME: There is already a push_word() in the emulator */ /* FixME: There is already a push_word() in the emulator */
void pushw(struct X86EMU *emu, uint16_t val) static void pushw(struct X86EMU *emu, uint16_t val)
{ {
emu->x86.R_ESP -= 2; emu->x86.R_ESP -= 2;
MEM_WW(((uint32_t) emu->x86.R_SS << 4) + emu->x86.R_SP, val); MEM_WW(((uint32_t) emu->x86.R_SS << 4) + emu->x86.R_SP, val);
} }
int run_bios_int(struct X86EMU *emu, int num) static int run_bios_int(struct X86EMU *emu, int num)
{ {
uint32_t eflags; uint32_t eflags;
eflags = emu->x86.R_EFLG; eflags = emu->x86.R_EFLG;
@@ -105,14 +93,14 @@ static uint8_t inb(struct X86EMU *emu, uint16_t port)
{ {
uint8_t val = 0; uint8_t val = 0;
if ((port >= offset_port) && (port <= offset_port + 0xFF)) if ((port >= offset_port) && (port <= offset_port + 0xff))
{ {
val = * (uint8_t *) (offset_io + (uint32_t) port); val = * (uint8_t *) (offset_io + (uint32_t) port);
} }
return val; return val;
} }
uint16_t inw(struct X86EMU *emu, uint16_t port) static uint16_t inw(struct X86EMU *emu, uint16_t port)
{ {
uint16_t val = 0; uint16_t val = 0;
@@ -123,9 +111,10 @@ uint16_t inw(struct X86EMU *emu, uint16_t port)
return val; return val;
} }
uint32_t inl(struct X86EMU *emu, uint16_t port) static uint32_t inl(struct X86EMU *emu, uint16_t port)
{ {
uint32_t val = 0; uint32_t val = 0;
if ((port >= offset_port) && (port <= offset_port + 0xFF)) if ((port >= offset_port) && (port <= offset_port + 0xFF))
{ {
val = swpl(*(uint32_t *)(offset_io + (uint32_t) port)); val = swpl(*(uint32_t *)(offset_io + (uint32_t) port));
@@ -153,10 +142,11 @@ uint32_t inl(struct X86EMU *emu, uint16_t port)
} }
dbg("inl(0x%x) = 0x%x\r\n", port, val); dbg("inl(0x%x) = 0x%x\r\n", port, val);
} }
return val; return val;
} }
void outb(struct X86EMU *emu, uint16_t port, uint8_t val) static void outb(struct X86EMU *emu, uint16_t port, uint8_t val)
{ {
if ((port >= offset_port) && (port <= offset_port + 0xFF)) if ((port >= offset_port) && (port <= offset_port + 0xFF))
{ {
@@ -164,7 +154,7 @@ void outb(struct X86EMU *emu, uint16_t port, uint8_t val)
} }
} }
void outw(struct X86EMU *emu, uint16_t port, uint16_t val) static void outw(struct X86EMU *emu, uint16_t port, uint16_t val)
{ {
if ((port >= offset_port) && (port <= offset_port + 0xFF)) if ((port >= offset_port) && (port <= offset_port + 0xFF))
{ {
@@ -172,7 +162,7 @@ void outw(struct X86EMU *emu, uint16_t port, uint16_t val)
} }
} }
void outl(struct X86EMU *emu, uint16_t port, uint32_t val) static void outl(struct X86EMU *emu, uint16_t port, uint32_t val)
{ {
if ((port >= offset_port) && (port <= offset_port + 0xFF)) if ((port >= offset_port) && (port <= offset_port + 0xFF))
{ {
@@ -185,7 +175,9 @@ void outl(struct X86EMU *emu, uint16_t port, uint32_t val)
else if ((port == 0xCFC) && ((config_address_reg & 0x80000000) !=0)) else if ((port == 0xCFC) && ((config_address_reg & 0x80000000) !=0))
{ {
if ((config_address_reg & 0xFC) == PCIBAR1) if ((config_address_reg & 0xFC) == PCIBAR1)
{
offset_port = (uint16_t)val & 0xFFFC; offset_port = (uint16_t)val & 0xFFFC;
}
else else
{ {
dbg("outl(0x%x, 0x%x) to PCI config space\r\n", port, val); dbg("outl(0x%x, 0x%x) to PCI config space\r\n", port, val);
@@ -196,20 +188,29 @@ void outl(struct X86EMU *emu, uint16_t port, uint32_t val)
/* Interrupt multiplexer */ /* Interrupt multiplexer */
void do_int(struct X86EMU *emu, int num) static void do_int(struct X86EMU *emu, int num)
{ {
int ret = 0; int ret = 0;
dbg("int %02xh\r\n", num);
switch (num) switch (num)
{ {
#ifndef _PC #ifndef _PC
case 0x10: case 0x10:
/* video interrupt */
/* fall through intentional */
case 0x42: case 0x42:
case 0x6D: /* video interrupt */
/* fall through intentional */
case 0x6d:
/* VGA internal interrupt */
dbg("int %02xh, AH=0x%02x, AL=0x%02x\r\n", num, emu->x86.register_a.I8_reg.h_reg, emu->x86.register_a.I8_reg.l_reg);
if (getIntVect(emu, num) == 0x0000) if (getIntVect(emu, num) == 0x0000)
dbg("uninitialised int vector\r\n"); err("uninitialised int vector\r\n");
if (getIntVect(emu, num) == 0xFF065) if (getIntVect(emu, num) == 0xFF065)
{ {
//ret = int42_handler(); //ret = int42_handler();
@@ -221,42 +222,52 @@ void do_int(struct X86EMU *emu, int num)
//ret = int15_handler(); //ret = int15_handler();
ret = 1; ret = 1;
break; break;
case 0x16: case 0x16:
//ret = int16_handler(); //ret = int16_handler();
ret = 0; ret = 0;
break; break;
case 0x1A:
case 0x1a:
ret = x86_pcibios_handler(emu); ret = x86_pcibios_handler(emu);
ret = 1; ret = 1;
break; break;
case 0xe6: case 0xe6:
//ret = intE6_handler(); //ret = intE6_handler();
ret = 0; ret = 0;
break; break;
default: default:
break; break;
} }
if (!ret) if (!ret)
{
ret = run_bios_int(emu, num); ret = run_bios_int(emu, num);
} }
}
static int setup_system_bios(void *base_addr) static int setup_system_bios(void *base_addr)
{ {
char *base = (char *) base_addr; char *base = (char *) base_addr;
int i; int i;
/* /*
* we trap the "industry standard entry points" to the BIOS * we trap the "industry standard entry points" to the BIOS
* and all other locations by filling them with "hlt" * and all other locations by filling them with "hlt"
* TODO: implement hlt-handler for these * TODO: implement hlt-handler for these
*/ */
for (i = 0; i < SIZE_EMU + 4; base[i++] = 0xF4); for (i = 0; i < SIZE_EMU + 4; base[i++] = 0xF4);
return(1); return 1;
} }
void run_bios(struct radeonfb_info *rinfo) void run_bios(struct radeonfb_info *rinfo)
{ {
long i, j; long i;
long j;
unsigned char *ptr; unsigned char *ptr;
struct rom_header *rom_header; struct rom_header *rom_header;
struct pci_data *rom_data; struct pci_data *rom_data;
@@ -290,14 +301,15 @@ void run_bios(struct radeonfb_info *rinfo)
config_address_reg = 0; config_address_reg = 0;
offset_port = 0x300; offset_port = 0x300;
offset_io = (uint32_t) rinfo->io_base - (uint32_t) offset_port; offset_io = (uint32_t) rinfo->io_base - (uint32_t) offset_port;
offset_mem = (uint32_t) rinfo->fb_base - 0xA0000; offset_mem = (uint32_t) rinfo->fb_base - 0xa0000;
rom_header = NULL; rom_header = NULL;
do do
{ {
rom_header = (struct rom_header *) ((unsigned long) rom_header + image_size); // get next image rom_header = (struct rom_header *) ((uintptr_t) rom_header + image_size); // get next image
rom_data = (struct pci_data *) ((unsigned long)rom_header + (unsigned long) BIOS_IN16((long) &rom_header->data)); rom_data = (struct pci_data *) ((uintptr_t) rom_header + (uintptr_t) BIOS_IN16((long) &rom_header->data));
image_size = (unsigned long) BIOS_IN16((long) &rom_data->ilen) * 512; image_size = (size_t) BIOS_IN16((long) &rom_data->ilen) * 512;
} while ((BIOS_IN8((long) &rom_data->type) != 0) && (BIOS_IN8((long) &rom_data->indicator) != 0)); // make sure we got x86 version } while ((BIOS_IN8((long) &rom_data->type) != 0) && (BIOS_IN8((long) &rom_data->indicator) != 0)); // make sure we got x86 version
if (BIOS_IN8((long) &rom_data->type) != 0) if (BIOS_IN8((long) &rom_data->type) != 0)
@@ -306,7 +318,7 @@ void run_bios(struct radeonfb_info *rinfo)
return; return;
} }
rom_size = (unsigned long) BIOS_IN8((long) &rom_header->size) * 512; rom_size = (size_t) BIOS_IN8((uintptr_t) &rom_header->size) * 512;
dbg("ROM size = 0x%lx\r\n", rom_size); dbg("ROM size = 0x%lx\r\n", rom_size);
if (PCI_CLASS_DISPLAY_VGA == BIOS_IN16((long) &rom_data->class_hi)) if (PCI_CLASS_DISPLAY_VGA == BIOS_IN16((long) &rom_data->class_hi))
@@ -315,44 +327,48 @@ void run_bios(struct radeonfb_info *rinfo)
setup_system_bios((char *) biosmem); setup_system_bios((char *) biosmem);
dbg("Copying VGA ROM Image from %p to %p (0x%lx bytes)\r\n", dbg("Copying VGA ROM Image from %p to %p (0x%lx bytes)\r\n",
(long) rinfo->bios_seg + (long) rom_header, (uintptr_t) rinfo->bios_seg + (uintptr_t) rom_header,
biosmem + PCI_VGA_RAM_IMAGE_START, rom_size); biosmem + PCI_VGA_RAM_IMAGE_START, rom_size);
{ {
long bytes_align = (long) rom_header & 3; long bytes_align = (uintptr_t) rom_header & 3;
ptr = (unsigned char *) biosmem; ptr = (uint8_t *) biosmem;
i = (long) rom_header; i = (long) rom_header;
j = PCI_VGA_RAM_IMAGE_START; j = PCI_VGA_RAM_IMAGE_START;
if (bytes_align) if (bytes_align)
{
for (; i < 4 - bytes_align; ptr[j++] = BIOS_IN8(i++)); for (; i < 4 - bytes_align; ptr[j++] = BIOS_IN8(i++));
}
for (; i < (long) rom_header + rom_size; i += 4, j += 4) for (; i < (long) rom_header + rom_size; i += 4, j += 4)
*((unsigned long *) &ptr[j]) = swpl(BIOS_IN32(i)); {
*((uintptr_t *) &ptr[j]) = swpl(BIOS_IN32(i));
}
} }
addr = PCI_VGA_RAM_IMAGE_START; addr = PCI_VGA_RAM_IMAGE_START;
} }
else else
{ {
memset((char *) biosmem, 0, SIZE_EMU); memset((uint8_t *) biosmem, 0, SIZE_EMU);
setup_system_bios((char *) biosmem); setup_system_bios((char *) biosmem);
dbg("Copying non-VGA ROM Image from %p to %p (0x%lx bytes)\r\n", dbg("Copying non-VGA ROM Image from %p to %p (0x%lx bytes)\r\n",
(long) rinfo->bios_seg + (long) rom_header, (uintptr_t) rinfo->bios_seg + (uintptr_t) rom_header,
biosmem + PCI_RAM_IMAGE_START, biosmem + PCI_RAM_IMAGE_START,
rom_size); rom_size);
ptr = (unsigned char *) biosmem; ptr = (uint8_t *) biosmem;
for (i = (long) rom_header, j = PCI_RAM_IMAGE_START; i < (long) rom_header + rom_size; ptr[j++] = BIOS_IN8(i++)); for (i = (long) rom_header, j = PCI_RAM_IMAGE_START; i < (long) rom_header + rom_size; ptr[j++] = BIOS_IN8(i++));
addr = PCI_RAM_IMAGE_START; addr = PCI_RAM_IMAGE_START;
} }
initialcs = (addr & 0xF0000) >> 4; initialcs = (addr & 0xf0000) >> 4;
initialip = (addr + 3) & 0xFFFF; initialip = (addr + 3) & 0xffff;
/* /*
* set emulator memory * set emulator memory
*/ */
emu.mem_base = (void *) biosmem; emu.mem_base = biosmem;
emu.mem_size = SIZE_EMU; emu.mem_size = SIZE_EMU;
for (i = 0; i < 256; i++) for (i = 0; i < 256; i++)
@@ -360,19 +376,20 @@ void run_bios(struct radeonfb_info *rinfo)
emu._X86EMU_intrTab[i] = do_int; emu._X86EMU_intrTab[i] = do_int;
} }
{
char *date = "01/01/99"; char *date = "01/01/99";
for (i = 0; date[i]; i++) for (i = 0; date[i]; i++)
{
emu.emu_wrb(&emu, 0xffff5 + i, date[i]); emu.emu_wrb(&emu, 0xffff5 + i, date[i]);
}
emu.emu_wrb(&emu, 0xffff7, '/'); emu.emu_wrb(&emu, 0xffff7, '/');
emu.emu_wrb(&emu, 0xffffa, '/'); emu.emu_wrb(&emu, 0xffffa, '/');
}
{
/* FixME: move PIT init to its own file */ /* FixME: move PIT init to its own file */
outb(&emu, 0x36, 0x43); outb(&emu, 0x36, 0x43);
outb(&emu, 0x00, 0x40); outb(&emu, 0x00, 0x40);
outb(&emu, 0x00, 0x40); outb(&emu, 0x00, 0x40);
}
// setup_int_vect(); // setup_int_vect();
/* cpu setup */ /* cpu setup */
@@ -398,14 +415,19 @@ void run_bios(struct radeonfb_info *rinfo)
// pushw(0x0013); /* 320 x 200 x 256 colors */ // pushw(0x0013); /* 320 x 200 x 256 colors */
// // pushw(0x000F); /* 640 x 350 x mono */ // // pushw(0x000F); /* 640 x 350 x mono */
// pushw(0xb890); /* nop, mov ax,#0x13 */ // pushw(0xb890); /* nop, mov ax,#0x13 */
pushw(&emu, emu.x86.R_SS); pushw(&emu, emu.x86.R_SS);
pushw(&emu, emu.x86.R_SP + 2); pushw(&emu, emu.x86.R_SP + 2);
dbg("X86EMU entering emulator\r\n"); dbg("X86EMU entering emulator\r\n");
//*vblsem = 0;
X86EMU_exec(&emu); X86EMU_exec(&emu);
//*vblsem = 1;
dbg("X86EMU halted\r\n"); dbg("X86EMU halted\r\n");
// biosfn_set_video_mode(0x13); /* 320 x 200 x 256 colors */ // biosfn_set_video_mode(0x13); /* 320 x 200 x 256 colors */
/*
* clear emulator memory once we are finished
*/
memset((char *) biosmem, 0, SIZE_EMU); memset((char *) biosmem, 0, SIZE_EMU);
} }

5
x86emu/x86emu.c
View File

@@ -219,6 +219,7 @@ void x86emu_intr_raise(struct X86EMU *emu, uint8_t intrnum)
emu->x86.intno = intrnum; emu->x86.intno = intrnum;
emu->x86.intr |= INTR_SYNCH; emu->x86.intr |= INTR_SYNCH;
} }
/**************************************************************************** /****************************************************************************
REMARKS: REMARKS:
Main execution loop for the emulator. We return from here when the system Main execution loop for the emulator. We return from here when the system
@@ -278,6 +279,8 @@ Halts the system by setting the halted system flag.
void void
X86EMU_halt_sys(struct X86EMU *emu) X86EMU_halt_sys(struct X86EMU *emu)
{ {
dbg("\r\n");
#ifdef _KERNEL #ifdef _KERNEL
longjmp(&emu->exec_state); longjmp(&emu->exec_state);
#else #else
@@ -346,7 +349,7 @@ fetch_word_imm(struct X86EMU *emu)
} }
/**************************************************************************** /****************************************************************************
RETURNS: RETURNS:
Immediate lone value read from instruction queue Immediate long value read from instruction queue
REMARKS: REMARKS:
This function returns the immediate byte from the instruction queue, and This function returns the immediate byte from the instruction queue, and