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

PCI memory access working

Browse Source
This commit is contained in:
Markus Fröschle
2016-10-15 21:26:49 +00:00
parent 369cc9dc0a
commit 42729fa2ea
68 changed files with 14798 additions and 2460 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
x86emu/x86biosemu.c
View File

@@ -10,6 +10,7 @@
#include "pci_ids.h"
#include "x86pcibios.h"
#define DEBUG
#include "debug.h"
#define USE_SDRAM
@@ -42,7 +43,7 @@ typedef struct
struct rom_header
{
uint16_t signature;
uint16_t signature;
uint8_t size;
uint8_t init[3];
uint8_t reserved[0x12];
@@ -63,7 +64,7 @@ struct pci_data
uint16_t irevision;
uint8_t type;
uint8_t indicator;
uint16_t reserved_2;
uint16_t reserved_2;
};
static struct radeonfb_info *rinfo_biosemu;
@@ -72,8 +73,6 @@ uint32_t offset_mem;
static uint32_t offset_io;
static uint32_t config_address_reg;
extern int x86_pcibios_emulator();
//X86EMU_sysEnv _X86EMU_env;
/* general software interrupt handler */
@@ -102,46 +101,42 @@ int run_bios_int(struct X86EMU *emu, int num)
return 1;
}
uint8_t inb(uint16_t port)
static uint8_t inb(struct X86EMU *emu, uint16_t port)
{
uint8_t val = 0;
if ((port >= offset_port) && (port <= offset_port + 0xFF))
{
val = * (uint8_t *) (offset_io + (uint32_t) port);
//dbg("%s: inb(0x%x) = 0x%x\r\n", __FUNCTION__, port, val);
}
return val;
}
uint16_t inw(uint16_t port)
uint16_t inw(struct X86EMU *emu, uint16_t port)
{
uint16_t val = 0;
if ((port >= offset_port) && (port <= offset_port + 0xFF))
{
val = swpw(*(uint16_t *)(offset_io + (uint32_t) port));
//dbg("inw(0x%x) = 0x%x\r\n", port, val);
}
return val;
}
uint32_t inl(uint16_t port)
uint32_t inl(struct X86EMU *emu, uint16_t port)
{
uint32_t val = 0;
if ((port >= offset_port) && (port <= offset_port + 0xFF))
{
val = swpl(*(uint32_t *)(offset_io + (uint32_t) port));
//dbg("0x%x) = 0x%x\r\n", port, val);
}
else if (port == 0xCF8)
{
val = config_address_reg;
dbg("inl(0x%x) = 0x%x\r\n", port, val);
}
else if ((port == 0xCFC) && ((config_address_reg & 0x80000000) != 0))
{
dbg("%s: PCI BIOS access to register %x\r\n", __FUNCTION__, config_address_reg);
dbg("PCI BIOS access to register %x\r\n", config_address_reg);
switch (config_address_reg & 0xFC)
{
case PCIIDR:
@@ -161,34 +156,30 @@ uint32_t inl(uint16_t port)
return val;
}
void outb(uint8_t val, uint16_t port)
void outb(struct X86EMU *emu, uint16_t port, uint8_t val)
{
if ((port >= offset_port) && (port <= offset_port + 0xFF))
{
//dbg("outb(0x%x, 0x%x)\r\n", port, val);
*(uint8_t *)(offset_io + (uint32_t) port) = val;
}
}
void outw(uint16_t val, uint16_t port)
void outw(struct X86EMU *emu, uint16_t port, uint16_t val)
{
if ((port >= offset_port) && (port <= offset_port + 0xFF))
{
//dbg("outw(0x%x, 0x%x)\r\n", port, val);
*(uint16_t *)(offset_io + (uint32_t) port) = swpw(val);
}
}
void outl(uint32_t val, uint16_t port)
void outl(struct X86EMU *emu, uint16_t port, uint32_t val)
{
if ((port >= offset_port) && (port <= offset_port + 0xFF))
{
//dbg("outl(0x%x, 0x%x)\r\n", port, val);
*(uint32_t *)(offset_io + (uint32_t) port) = swpl(val);
}
else if (port == 0xCF8)
{
dbg("outl(0x%x, 0x%x)\r\n", port, val);
config_address_reg = val;
}
else if ((port == 0xCFC) && ((config_address_reg & 0x80000000) !=0))
@@ -209,6 +200,8 @@ void do_int(struct X86EMU *emu, int num)
{
int ret = 0;
dbg("int %02xh\r\n", num);
switch (num)
{
#ifndef _PC
@@ -275,9 +268,17 @@ void run_bios(struct radeonfb_info *rinfo)
unsigned short initialip;
unsigned short devfn = (unsigned short) rinfo->handle;
struct X86EMU emu;
struct X86EMU emu = {0};
X86EMU_init_default(&emu);
emu.emu_inb = inb;
emu.emu_inw = inw;
emu.emu_inl = inl;
emu.emu_outb = outb;
emu.emu_outw = outw;
emu.emu_outl = outl;
if ((rinfo->mmio_base == NULL) || (rinfo->io_base == NULL))
{
@@ -301,19 +302,20 @@ void run_bios(struct radeonfb_info *rinfo)
if (BIOS_IN8((long) &rom_data->type) != 0)
{
dbg("%s: ROM data type = 0x%x\r\n", __FUNCTION__, BIOS_IN8((long) &rom_data->type));
dbg("unknown ROM data type = 0x%x\r\n", BIOS_IN8((long) &rom_data->type));
return;
}
rom_size = (unsigned long) BIOS_IN8((long) &rom_header->size) * 512;
dbg("ROM size = 0x%lx\r\n", rom_size);
if (PCI_CLASS_DISPLAY_VGA == BIOS_IN16((long) &rom_data->class_hi))
{
memset((char *) biosmem, 0, SIZE_EMU);
setup_system_bios((char *) biosmem);
dbg("%s: Copying VGA ROM Image from %p to %p (0x%lx bytes)\r\n",
__FUNCTION__, (long) rinfo->bios_seg + (long) rom_header,
dbg("Copying VGA ROM Image from %p to %p (0x%lx bytes)\r\n",
(long) rinfo->bios_seg + (long) rom_header,
biosmem + PCI_VGA_RAM_IMAGE_START, rom_size);
{
long bytes_align = (long) rom_header & 3;
@@ -335,7 +337,7 @@ void run_bios(struct radeonfb_info *rinfo)
memset((char *) biosmem, 0, SIZE_EMU);
setup_system_bios((char *) biosmem);
dbg("%s: Copying non-VGA ROM Image from %p to %p (0x%lx bytes)\r\n", __FUNCTION__,
dbg("Copying non-VGA ROM Image from %p to %p (0x%lx bytes)\r\n",
(long) rinfo->bios_seg + (long) rom_header,
biosmem + PCI_RAM_IMAGE_START,
rom_size);
@@ -367,16 +369,16 @@ void run_bios(struct radeonfb_info *rinfo)
}
{
/* FixME: move PIT init to its own file */
outb(0x36, 0x43);
outb(0x00, 0x40);
outb(0x00, 0x40);
outb(&emu, 0x36, 0x43);
outb(&emu, 0x00, 0x40);
outb(&emu, 0x00, 0x40);
}
// setup_int_vect();
/* cpu setup */
emu.x86.R_AX = devfn ? devfn : 0xff;
emu.x86.R_DX = 0x80;
emu.x86.R_EIP = initialip;
emu.x86.R_IP = initialip;
emu.x86.R_CS = initialcs;
/* Initialize stack and data segment */
@@ -398,16 +400,12 @@ void run_bios(struct radeonfb_info *rinfo)
// pushw(0xb890); /* nop, mov ax,#0x13 */
pushw(&emu, emu.x86.R_SS);
pushw(&emu, emu.x86.R_SP + 2);
#ifdef DBG_X86EMU
X86EMU_trace_on();
X86EMU_set_debug(DEBUG_DECODE_F | DEBUG_TRACE_F);
#endif
dbg("%s: X86EMU entering emulator\r\n", __FUNCTION__);
dbg("X86EMU entering emulator\r\n");
//*vblsem = 0;
X86EMU_exec(&emu);
//*vblsem = 1;
dbg("%s: X86EMU halted\r\n", __FUNCTION__);
dbg("X86EMU halted\r\n");
// biosfn_set_video_mode(0x13); /* 320 x 200 x 256 colors */
memset((char *) biosmem, 0, SIZE_EMU);
}

2893
x86emu/x86emu.c
View File

File diff suppressed because it is too large Load Diff

54
x86emu/x86emu_util.c
View File

@@ -79,11 +79,11 @@ Reads a byte value from the emulator memory.
****************************************************************************/
static uint8_t rdb(struct X86EMU *emu, uint32_t addr)
{
if (addr > emu->mem_size - 1)
if (addr > emu->mem_size - 1)
{
X86EMU_halt_sys(emu);
X86EMU_halt_sys(emu);
}
return emu->mem_base[addr];
return emu->mem_base[addr];
}
/****************************************************************************
@@ -98,11 +98,11 @@ Reads a word value from the emulator memory.
****************************************************************************/
static uint16_t rdw(struct X86EMU *emu, uint32_t addr)
{
if (addr > emu->mem_size - 2)
if (addr > emu->mem_size - 2)
{
X86EMU_halt_sys(emu);
X86EMU_halt_sys(emu);
}
return le16dec(emu->mem_base + addr);
return le16dec(emu->mem_base + addr);
}
/****************************************************************************
@@ -116,11 +116,11 @@ Reads a long value from the emulator memory.
****************************************************************************/
static uint32_t rdl(struct X86EMU *emu, uint32_t addr)
{
if (addr > emu->mem_size - 4)
if (addr > emu->mem_size - 4)
{
X86EMU_halt_sys(emu);
X86EMU_halt_sys(emu);
}
return le32dec(emu->mem_base + addr);
return le32dec(emu->mem_base + addr);
}
/****************************************************************************
@@ -133,11 +133,11 @@ Writes a byte value to emulator memory.
****************************************************************************/
static void wrb(struct X86EMU *emu, uint32_t addr, uint8_t val)
{
if (addr > emu->mem_size - 1)
if (addr > emu->mem_size - 1)
{
X86EMU_halt_sys(emu);
X86EMU_halt_sys(emu);
}
emu->mem_base[addr] = val;
emu->mem_base[addr] = val;
}
/****************************************************************************
@@ -150,11 +150,11 @@ Writes a word value to emulator memory.
****************************************************************************/
static void wrw(struct X86EMU *emu, uint32_t addr, uint16_t val)
{
if (addr > emu->mem_size - 2)
if (addr > emu->mem_size - 2)
{
X86EMU_halt_sys(emu);
X86EMU_halt_sys(emu);
}
le16enc(emu->mem_base + addr, val);
le16enc(emu->mem_base + addr, val);
}
/****************************************************************************
PARAMETERS:
@@ -166,28 +166,28 @@ Writes a long value to emulator memory.
****************************************************************************/
static void wrl(struct X86EMU *emu, uint32_t addr, uint32_t val)
{
if (addr > emu->mem_size - 4)
if (addr > emu->mem_size - 4)
{
X86EMU_halt_sys(emu);
X86EMU_halt_sys(emu);
}
le32enc(emu->mem_base + addr, val);
le32enc(emu->mem_base + addr, val);
}
/*----------------------------- Setup -------------------------------------*/
void X86EMU_init_default(struct X86EMU *emu)
{
int i;
int i;
emu->emu_rdb = rdb;
emu->emu_rdw = rdw;
emu->emu_rdl = rdl;
emu->emu_wrb = wrb;
emu->emu_wrw = wrw;
emu->emu_wrl = wrl;
emu->emu_rdb = rdb;
emu->emu_rdw = rdw;
emu->emu_rdl = rdl;
emu->emu_wrb = wrb;
emu->emu_wrw = wrw;
emu->emu_wrl = wrl;
for (i = 0; i < 256; i++)
for (i = 0; i < 256; i++)
{
emu->_X86EMU_intrTab[i] = NULL;
emu->_X86EMU_intrTab[i] = NULL;
}
}

10
x86emu/x86pcibios.c
View File

@@ -6,14 +6,8 @@
#include "bas_printf.h"
extern unsigned short offset_port;
#define DBG_PCIBIOS
#ifdef DBG_PCIBIOS
#define dbg(format, arg...) do { xprintf("DEBUG (%s()): " format, __FUNCTION__, ##arg);} while(0)
#else
#define dbg(format, arg...) do {;} while (0)
#endif /* DBG_PCIBIOS */
#define err(format, arg...) do { xprintf("ERROR (%s()): " format, __FUNCTION__, ##arg); } while(0);
#define DEBUG
#include "debug.h"
int x86_pcibios_handler(struct X86EMU *emu)
{