From 6f7e9aec5eb5bdfa57a9e458e391b785c283a007 Mon Sep 17 00:00:00 2001 From: bellard Date: Sun, 13 Mar 2005 09:43:36 +0000 Subject: [PATCH] sparc fixes (Blue Swirl) git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@1326 c046a42c-6fe2-441c-8c8c-71466251a162 --- Makefile.target | 2 +- TODO | 1 - hw/esp.c | 192 ++++ hw/fdc.c | 37 +- hw/sun4m.c | 110 ++- hw/tcx.c | 129 ++- pc-bios/proll.elf | Bin 133338 -> 41236 bytes pc-bios/proll.patch | 1919 ++++++++++++++++++++++++++------------ target-sparc/helper.c | 18 +- target-sparc/op_helper.c | 4 +- vl.c | 10 +- vl.h | 5 +- 12 files changed, 1751 insertions(+), 676 deletions(-) create mode 100644 hw/esp.c diff --git a/Makefile.target b/Makefile.target index 5c82e38a60e..68563299e79 100644 --- a/Makefile.target +++ b/Makefile.target @@ -338,7 +338,7 @@ VL_OBJS+= mc146818rtc.o serial.o i8259.o i8254.o fdc.o m48t59.o VL_OBJS+= ppc_prep.o ppc_chrp.o cuda.o adb.o openpic.o mixeng.o endif ifeq ($(TARGET_BASE_ARCH), sparc) -VL_OBJS+= sun4m.o tcx.o lance.o iommu.o m48t08.o magic-load.o slavio_intctl.o slavio_timer.o slavio_serial.o fdc.o +VL_OBJS+= sun4m.o tcx.o lance.o iommu.o m48t08.o magic-load.o slavio_intctl.o slavio_timer.o slavio_serial.o fdc.o esp.o endif ifdef CONFIG_GDBSTUB VL_OBJS+=gdbstub.o diff --git a/TODO b/TODO index cd389505442..088c26c69b0 100644 --- a/TODO +++ b/TODO @@ -3,7 +3,6 @@ short term: - debug option in 'configure' script + disable -fomit-frame-pointer - Precise VGA timings for old games/demos (malc patch) - merge PIC spurious interrupt patch -- merge VNC keyboard patch - merge Solaris patch - warning for OS/2: must not use 128 MB memory (merge bochs cmos patch ?) - config file (at least for windows/Mac OS X) diff --git a/hw/esp.c b/hw/esp.c new file mode 100644 index 00000000000..2456c345fdf --- /dev/null +++ b/hw/esp.c @@ -0,0 +1,192 @@ +/* + * QEMU ESP emulation + * + * Copyright (c) 2005 Fabrice Bellard + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ +#include "vl.h" + +/* debug ESP card */ +#define DEBUG_ESP + +#ifdef DEBUG_ESP +#define DPRINTF(fmt, args...) \ +do { printf("ESP: " fmt , ##args); } while (0) +#else +#define DPRINTF(fmt, args...) +#endif + +#define ESPDMA_REGS 4 +#define ESPDMA_MAXADDR (ESPDMA_REGS * 4 - 1) +#define ESP_MAXREG 0x3f + +typedef struct ESPState { + BlockDriverState **bd; + uint8_t regs[ESP_MAXREG]; + int irq; + uint32_t espdmaregs[ESPDMA_REGS]; +} ESPState; + +static void esp_reset(void *opaque) +{ + ESPState *s = opaque; + memset(s->regs, 0, ESP_MAXREG); + s->regs[0x0e] = 0x4; // Indicate fas100a + memset(s->espdmaregs, 0, ESPDMA_REGS * 4); +} + +static uint32_t esp_mem_readb(void *opaque, target_phys_addr_t addr) +{ + ESPState *s = opaque; + uint32_t saddr; + + saddr = (addr & ESP_MAXREG) >> 2; + switch (saddr) { + default: + break; + } + DPRINTF("esp: read reg[%d]: 0x%2.2x\n", saddr, s->regs[saddr]); + return s->regs[saddr]; +} + +static void esp_mem_writeb(void *opaque, target_phys_addr_t addr, uint32_t val) +{ + ESPState *s = opaque; + uint32_t saddr; + + saddr = (addr & ESP_MAXREG) >> 2; + DPRINTF("esp: write reg[%d]: 0x%2.2x -> 0x%2.2x\n", saddr, s->regs[saddr], val); + switch (saddr) { + case 3: + // Command + switch(val & 0x7f) { + case 0: + DPRINTF("esp: NOP (%2.2x)\n", val); + break; + case 2: + DPRINTF("esp: Chip reset (%2.2x)\n", val); + esp_reset(s); + break; + case 3: + DPRINTF("esp: Bus reset (%2.2x)\n", val); + break; + case 0x1a: + DPRINTF("esp: Set ATN (%2.2x)\n", val); + break; + case 0x42: + DPRINTF("esp: Select with ATN (%2.2x)\n", val); + s->regs[4] = 0x1a; // Status: TCNT | TDONE | CMD + s->regs[5] = 0x20; // Intr: Disconnect, nobody there + s->regs[6] = 0x4; // Seq: Cmd done + pic_set_irq(s->irq, 1); + break; + } + break; + case 4 ... 7: + case 9 ... 0xf: + break; + default: + s->regs[saddr] = val; + break; + } +} + +static CPUReadMemoryFunc *esp_mem_read[3] = { + esp_mem_readb, + esp_mem_readb, + esp_mem_readb, +}; + +static CPUWriteMemoryFunc *esp_mem_write[3] = { + esp_mem_writeb, + esp_mem_writeb, + esp_mem_writeb, +}; + +static uint32_t espdma_mem_readl(void *opaque, target_phys_addr_t addr) +{ + ESPState *s = opaque; + uint32_t saddr; + + saddr = (addr & ESPDMA_MAXADDR) >> 2; + return s->espdmaregs[saddr]; +} + +static void espdma_mem_writel(void *opaque, target_phys_addr_t addr, uint32_t val) +{ + ESPState *s = opaque; + uint32_t saddr; + + saddr = (addr & ESPDMA_MAXADDR) >> 2; + s->espdmaregs[saddr] = val; +} + +static CPUReadMemoryFunc *espdma_mem_read[3] = { + espdma_mem_readl, + espdma_mem_readl, + espdma_mem_readl, +}; + +static CPUWriteMemoryFunc *espdma_mem_write[3] = { + espdma_mem_writel, + espdma_mem_writel, + espdma_mem_writel, +}; + +static void esp_save(QEMUFile *f, void *opaque) +{ + ESPState *s = opaque; + +} + +static int esp_load(QEMUFile *f, void *opaque, int version_id) +{ + ESPState *s = opaque; + + if (version_id != 1) + return -EINVAL; + + return 0; +} + +void esp_init(BlockDriverState **bd, int irq, uint32_t espaddr, uint32_t espdaddr) +{ + ESPState *s; + int esp_io_memory, espdma_io_memory; + + s = qemu_mallocz(sizeof(ESPState)); + if (!s) + return; + + s->bd = bd; + s->irq = irq; + + esp_io_memory = cpu_register_io_memory(0, esp_mem_read, esp_mem_write, s); + cpu_register_physical_memory(espaddr, ESP_MAXREG*4, esp_io_memory); + + espdma_io_memory = cpu_register_io_memory(0, espdma_mem_read, espdma_mem_write, s); + cpu_register_physical_memory(espdaddr, 16, espdma_io_memory); + + esp_reset(s); + + register_savevm("esp", espaddr, 1, esp_save, esp_load, s); + qemu_register_reset(esp_reset, s); +} + diff --git a/hw/fdc.c b/hw/fdc.c index fc6b50257f2..3890ace120e 100644 --- a/hw/fdc.c +++ b/hw/fdc.c @@ -94,21 +94,6 @@ typedef struct fdrive_t { uint8_t ro; /* Is read-only */ } fdrive_t; -#ifdef TARGET_SPARC -/* XXX: suppress those hacks */ -#define DMA_read_memory(a,b,c,d) -#define DMA_write_memory(a,b,c,d) -void DMA_register_channel (int nchan, - DMA_transfer_handler transfer_handler, - void *opaque) -{ -} -#define DMA_hold_DREQ(a) -#define DMA_release_DREQ(a) -#define DMA_get_channel_mode(a) (0) -#define DMA_schedule(a) -#endif - static void fd_init (fdrive_t *drv, BlockDriverState *bs) { /* Drive */ @@ -423,6 +408,12 @@ static uint32_t fdctrl_read (void *opaque, uint32_t reg) uint32_t retval; switch (reg & 0x07) { +#ifdef TARGET_SPARC + case 0x00: + // Identify to Linux as S82078B + retval = fdctrl_read_statusB(fdctrl); + break; +#endif case 0x01: retval = fdctrl_read_statusB(fdctrl); break; @@ -577,6 +568,14 @@ static void fdctrl_reset_irq (fdctrl_t *fdctrl) static void fdctrl_raise_irq (fdctrl_t *fdctrl, uint8_t status) { +#ifdef TARGET_SPARC + // Sparc mutation + if (!fdctrl->dma_en) { + fdctrl->state &= ~FD_CTRL_BUSY; + fdctrl->int_status = status; + return; + } +#endif if (~(fdctrl->state & FD_CTRL_INTR)) { pic_set_irq(fdctrl->irq_lvl, 1); fdctrl->state |= FD_CTRL_INTR; @@ -980,11 +979,11 @@ static int fdctrl_transfer_handler (void *opaque, int nchan, len = dma_len - fdctrl->data_pos; if (len + rel_pos > FD_SECTOR_LEN) len = FD_SECTOR_LEN - rel_pos; - FLOPPY_DPRINTF("copy %d bytes (%d %d %d) %d pos %d %02x %02x " - "(%d-0x%08x 0x%08x)\n", len, size, fdctrl->data_pos, + FLOPPY_DPRINTF("copy %d bytes (%d %d %d) %d pos %d %02x " + "(%d-0x%08x 0x%08x)\n", len, dma_len, fdctrl->data_pos, fdctrl->data_len, fdctrl->cur_drv, cur_drv->head, cur_drv->track, cur_drv->sect, fd_sector(cur_drv), - fd_sector(cur_drv) * 512, addr); + fd_sector(cur_drv) * 512); if (fdctrl->data_dir != FD_DIR_WRITE || len < FD_SECTOR_LEN || rel_pos != 0) { /* READ & SCAN commands and realign to a sector for WRITE */ @@ -1045,7 +1044,7 @@ static int fdctrl_transfer_handler (void *opaque, int nchan, FLOPPY_DPRINTF("seek to next sector (%d %02x %02x => %d) (%d)\n", cur_drv->head, cur_drv->track, cur_drv->sect, fd_sector(cur_drv), - fdctrl->data_pos - size); + fdctrl->data_pos - len); /* XXX: cur_drv->sect >= cur_drv->last_sect should be an error in fact */ if (cur_drv->sect >= cur_drv->last_sect || diff --git a/hw/sun4m.c b/hw/sun4m.c index 0af062d9678..b186b23f13e 100644 --- a/hw/sun4m.c +++ b/hw/sun4m.c @@ -36,7 +36,10 @@ // IRQs are not PIL ones, but master interrupt controller register // bits #define PHYS_JJ_IOMMU 0x10000000 /* I/O MMU */ -#define PHYS_JJ_TCX_FB 0x50800000 /* Start address, frame buffer body */ +#define PHYS_JJ_TCX_FB 0x50000000 /* TCX frame buffer */ +#define PHYS_JJ_ESPDMA 0x78400000 /* ESP DMA controller */ +#define PHYS_JJ_ESP 0x78800000 /* ESP SCSI */ +#define PHYS_JJ_ESP_IRQ 18 #define PHYS_JJ_LEDMA 0x78400010 /* Lance DMA controller */ #define PHYS_JJ_LE 0x78C00000 /* Lance ethernet */ #define PHYS_JJ_LE_IRQ 16 @@ -50,7 +53,6 @@ #define PHYS_JJ_MS_KBD_IRQ 14 #define PHYS_JJ_SER 0x71100000 /* Serial */ #define PHYS_JJ_SER_IRQ 15 -#define PHYS_JJ_SCSI_IRQ 18 #define PHYS_JJ_FDC 0x71400000 /* Floppy */ #define PHYS_JJ_FLOPPY_IRQ 22 @@ -61,32 +63,86 @@ uint64_t cpu_get_tsc() return qemu_get_clock(vm_clock); } -void DMA_run() {} +int DMA_get_channel_mode (int nchan) +{ + return 0; +} +int DMA_read_memory (int nchan, void *buf, int pos, int size) +{ + return 0; +} +int DMA_write_memory (int nchan, void *buf, int pos, int size) +{ + return 0; +} +void DMA_hold_DREQ (int nchan) {} +void DMA_release_DREQ (int nchan) {} +void DMA_schedule(int nchan) {} +void DMA_run (void) {} +void DMA_init (int high_page_enable) {} +void DMA_register_channel (int nchan, + DMA_transfer_handler transfer_handler, + void *opaque) +{ +} + +static void nvram_set_word (m48t08_t *nvram, uint32_t addr, uint16_t value) +{ + m48t08_write(nvram, addr++, (value >> 8) & 0xff); + m48t08_write(nvram, addr++, value & 0xff); +} + +static void nvram_set_lword (m48t08_t *nvram, uint32_t addr, uint32_t value) +{ + m48t08_write(nvram, addr++, value >> 24); + m48t08_write(nvram, addr++, (value >> 16) & 0xff); + m48t08_write(nvram, addr++, (value >> 8) & 0xff); + m48t08_write(nvram, addr++, value & 0xff); +} + +static void nvram_set_string (m48t08_t *nvram, uint32_t addr, + const unsigned char *str, uint32_t max) +{ + unsigned int i; + + for (i = 0; i < max && str[i] != '\0'; i++) { + m48t08_write(nvram, addr + i, str[i]); + } + m48t08_write(nvram, addr + max - 1, '\0'); +} static m48t08_t *nvram; -static void nvram_init(m48t08_t *nvram, uint8_t *macaddr, const char *cmdline) +extern int nographic; + +static void nvram_init(m48t08_t *nvram, uint8_t *macaddr, const char *cmdline, + int boot_device, uint32_t RAM_size, + uint32_t kernel_size, + int width, int height, int depth) { unsigned char tmp = 0; int i, j; - i = 0x40; + // Try to match PPC NVRAM + nvram_set_string(nvram, 0x00, "QEMU_BIOS", 16); + nvram_set_lword(nvram, 0x10, 0x00000001); /* structure v1 */ + // NVRAM_size, arch not applicable + m48t08_write(nvram, 0x2F, nographic & 0xff); + nvram_set_lword(nvram, 0x30, RAM_size); + m48t08_write(nvram, 0x34, boot_device & 0xff); + nvram_set_lword(nvram, 0x38, KERNEL_LOAD_ADDR); + nvram_set_lword(nvram, 0x3C, kernel_size); if (cmdline) { - uint32_t cmdline_len; - strcpy(phys_ram_base + CMDLINE_ADDR, cmdline); - m48t08_write(nvram, i++, CMDLINE_ADDR >> 24); - m48t08_write(nvram, i++, (CMDLINE_ADDR >> 16) & 0xff); - m48t08_write(nvram, i++, (CMDLINE_ADDR >> 8) & 0xff); - m48t08_write(nvram, i++, CMDLINE_ADDR & 0xff); - - cmdline_len = strlen(cmdline); - m48t08_write(nvram, i++, cmdline_len >> 24); - m48t08_write(nvram, i++, (cmdline_len >> 16) & 0xff); - m48t08_write(nvram, i++, (cmdline_len >> 8) & 0xff); - m48t08_write(nvram, i++, cmdline_len & 0xff); + nvram_set_lword(nvram, 0x40, CMDLINE_ADDR); + nvram_set_lword(nvram, 0x44, strlen(cmdline)); } + // initrd_image, initrd_size passed differently + nvram_set_word(nvram, 0x54, width); + nvram_set_word(nvram, 0x56, height); + nvram_set_word(nvram, 0x58, depth); + // Sun4m specific use i = 0x1fd8; m48t08_write(nvram, i++, 0x01); m48t08_write(nvram, i++, 0x80); /* Sun4m OBP */ @@ -155,7 +211,7 @@ void sun4m_init(int ram_size, int vga_ram_size, int boot_device, char buf[1024]; int ret, linux_boot; unsigned int i; - unsigned long vram_size = 0x100000, prom_offset, initrd_size; + long vram_size = 0x100000, prom_offset, initrd_size, kernel_size; linux_boot = (kernel_filename != NULL); @@ -164,14 +220,14 @@ void sun4m_init(int ram_size, int vga_ram_size, int boot_device, iommu = iommu_init(PHYS_JJ_IOMMU); slavio_intctl = slavio_intctl_init(PHYS_JJ_INTR0, PHYS_JJ_INTR_G); - tcx = tcx_init(ds, PHYS_JJ_TCX_FB, phys_ram_base + ram_size, ram_size, vram_size); + tcx = tcx_init(ds, PHYS_JJ_TCX_FB, phys_ram_base + ram_size, ram_size, vram_size, graphic_width, graphic_height); lance_init(&nd_table[0], PHYS_JJ_LE_IRQ, PHYS_JJ_LE, PHYS_JJ_LEDMA); nvram = m48t08_init(PHYS_JJ_EEPROM, PHYS_JJ_EEPROM_SIZE); - nvram_init(nvram, (uint8_t *)&nd_table[0].macaddr, kernel_cmdline); slavio_timer_init(PHYS_JJ_CLOCK, PHYS_JJ_CLOCK_IRQ, PHYS_JJ_CLOCK1, PHYS_JJ_CLOCK1_IRQ); slavio_serial_ms_kbd_init(PHYS_JJ_MS_KBD, PHYS_JJ_MS_KBD_IRQ); slavio_serial_init(PHYS_JJ_SER, PHYS_JJ_SER_IRQ, serial_hds[0], serial_hds[1]); fdctrl_init(PHYS_JJ_FLOPPY_IRQ, 0, 1, PHYS_JJ_FDC, fd_table); + esp_init(bs_table, PHYS_JJ_ESP_IRQ, PHYS_JJ_ESP, PHYS_JJ_ESPDMA); prom_offset = ram_size + vram_size; @@ -189,13 +245,14 @@ void sun4m_init(int ram_size, int vga_ram_size, int boot_device, cpu_register_physical_memory(PROM_ADDR, (ret + TARGET_PAGE_SIZE) & TARGET_PAGE_MASK, prom_offset | IO_MEM_ROM); + kernel_size = 0; if (linux_boot) { - ret = load_elf(kernel_filename, phys_ram_base + KERNEL_LOAD_ADDR); - if (ret < 0) - ret = load_aout(kernel_filename, phys_ram_base + KERNEL_LOAD_ADDR); - if (ret < 0) - ret = load_image(kernel_filename, phys_ram_base + KERNEL_LOAD_ADDR); - if (ret < 0) { + kernel_size = load_elf(kernel_filename, phys_ram_base + KERNEL_LOAD_ADDR); + if (kernel_size < 0) + kernel_size = load_aout(kernel_filename, phys_ram_base + KERNEL_LOAD_ADDR); + if (kernel_size < 0) + kernel_size = load_image(kernel_filename, phys_ram_base + KERNEL_LOAD_ADDR); + if (kernel_size < 0) { fprintf(stderr, "qemu: could not load kernel '%s'\n", kernel_filename); exit(1); @@ -222,4 +279,5 @@ void sun4m_init(int ram_size, int vga_ram_size, int boot_device, } } } + nvram_init(nvram, (uint8_t *)&nd_table[0].macaddr, kernel_cmdline, boot_device, ram_size, kernel_size, graphic_width, graphic_height, graphic_depth); } diff --git a/hw/tcx.c b/hw/tcx.c index 6c4df7c89a9..c0fddf31d78 100644 --- a/hw/tcx.c +++ b/hw/tcx.c @@ -1,7 +1,7 @@ /* - * QEMU Sun4m System Emulator + * QEMU TCX Frame buffer * - * Copyright (c) 2003-2004 Fabrice Bellard + * Copyright (c) 2003-2005 Fabrice Bellard * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -25,29 +25,16 @@ #define MAXX 1024 #define MAXY 768 -/* - * Proll uses only small part of display, we need to switch to full - * display when we get linux framebuffer console or X11 running. For - * now it's just slower and awkward. -*/ -#if 1 -#define XSZ (8*80) -#define YSZ (24*11) -#define XOFF (MAXX-XSZ) -#define YOFF (MAXY-YSZ) -#else -#define XSZ MAXX -#define YSZ MAXY -#define XOFF 0 -#define YOFF 0 -#endif +#define TCX_DAC_NREGS 16 typedef struct TCXState { uint32_t addr; DisplayState *ds; uint8_t *vram; unsigned long vram_offset; + uint16_t width, height; uint8_t r[256], g[256], b[256]; + uint8_t dac_index, dac_state; } TCXState; static void tcx_draw_line32(TCXState *s1, uint8_t *d, @@ -58,9 +45,9 @@ static void tcx_draw_line32(TCXState *s1, uint8_t *d, for(x = 0; x < width; x++) { val = *s++; - *d++ = s1->r[val]; - *d++ = s1->g[val]; *d++ = s1->b[val]; + *d++ = s1->g[val]; + *d++ = s1->r[val]; d++; } } @@ -73,9 +60,9 @@ static void tcx_draw_line24(TCXState *s1, uint8_t *d, for(x = 0; x < width; x++) { val = *s++; - *d++ = s1->r[val]; - *d++ = s1->g[val]; *d++ = s1->b[val]; + *d++ = s1->g[val]; + *d++ = s1->r[val]; } } @@ -104,12 +91,12 @@ void tcx_update_display(void *opaque) if (ts->ds->depth == 0) return; - page = ts->vram_offset + YOFF*MAXX; + page = ts->vram_offset; y_start = -1; page_min = 0x7fffffff; page_max = -1; d = ts->ds->data; - s = ts->vram + YOFF*MAXX + XOFF; + s = ts->vram; dd = ts->ds->linesize; ds = 1024; @@ -128,7 +115,7 @@ void tcx_update_display(void *opaque) return; } - for(y = 0; y < YSZ; y += 4, page += TARGET_PAGE_SIZE) { + for(y = 0; y < ts->height; y += 4, page += TARGET_PAGE_SIZE) { if (cpu_physical_memory_get_dirty(page, VGA_DIRTY_FLAG)) { if (y_start < 0) y_start = y; @@ -136,23 +123,23 @@ void tcx_update_display(void *opaque) page_min = page; if (page > page_max) page_max = page; - f(ts, d, s, XSZ); + f(ts, d, s, ts->width); d += dd; s += ds; - f(ts, d, s, XSZ); + f(ts, d, s, ts->width); d += dd; s += ds; - f(ts, d, s, XSZ); + f(ts, d, s, ts->width); d += dd; s += ds; - f(ts, d, s, XSZ); + f(ts, d, s, ts->width); d += dd; s += ds; } else { if (y_start >= 0) { /* flush to display */ dpy_update(ts->ds, 0, y_start, - XSZ, y - y_start); + ts->width, y - y_start); y_start = -1; } d += dd * 4; @@ -162,7 +149,7 @@ void tcx_update_display(void *opaque) if (y_start >= 0) { /* flush to display */ dpy_update(ts->ds, 0, y_start, - XSZ, y - y_start); + ts->width, y - y_start); } /* reset modified pages */ if (page_max != -1) { @@ -187,9 +174,13 @@ static void tcx_save(QEMUFile *f, void *opaque) qemu_put_be32s(f, (uint32_t *)&s->addr); qemu_put_be32s(f, (uint32_t *)&s->vram); + qemu_put_be16s(f, (uint16_t *)&s->height); + qemu_put_be16s(f, (uint16_t *)&s->width); qemu_put_buffer(f, s->r, 256); qemu_put_buffer(f, s->g, 256); qemu_put_buffer(f, s->b, 256); + qemu_put_8s(f, &s->dac_index); + qemu_put_8s(f, &s->dac_state); } static int tcx_load(QEMUFile *f, void *opaque, int version_id) @@ -201,9 +192,13 @@ static int tcx_load(QEMUFile *f, void *opaque, int version_id) qemu_get_be32s(f, (uint32_t *)&s->addr); qemu_get_be32s(f, (uint32_t *)&s->vram); + qemu_get_be16s(f, (uint16_t *)&s->height); + qemu_get_be16s(f, (uint16_t *)&s->width); qemu_get_buffer(f, s->r, 256); qemu_get_buffer(f, s->g, 256); qemu_get_buffer(f, s->b, 256); + qemu_get_8s(f, &s->dac_index); + qemu_get_8s(f, &s->dac_state); return 0; } @@ -219,12 +214,66 @@ static void tcx_reset(void *opaque) memset(s->vram, 0, MAXX*MAXY); cpu_physical_memory_reset_dirty(s->vram_offset, s->vram_offset + MAXX*MAXY, VGA_DIRTY_FLAG); + s->dac_index = 0; + s->dac_state = 0; +} + +static uint32_t tcx_dac_readl(void *opaque, target_phys_addr_t addr) +{ + return 0; +} + +static void tcx_dac_writel(void *opaque, target_phys_addr_t addr, uint32_t val) +{ + TCXState *s = opaque; + uint32_t saddr; + + saddr = (addr & (TCX_DAC_NREGS - 1)) >> 2; + switch (saddr) { + case 0: + s->dac_index = val >> 24; + s->dac_state = 0; + break; + case 1: + switch (s->dac_state) { + case 0: + s->r[s->dac_index] = val >> 24; + s->dac_state++; + break; + case 1: + s->g[s->dac_index] = val >> 24; + s->dac_state++; + break; + case 2: + s->b[s->dac_index] = val >> 24; + default: + s->dac_state = 0; + break; + } + break; + default: + break; + } + return; } +static CPUReadMemoryFunc *tcx_dac_read[3] = { + tcx_dac_readl, + tcx_dac_readl, + tcx_dac_readl, +}; + +static CPUWriteMemoryFunc *tcx_dac_write[3] = { + tcx_dac_writel, + tcx_dac_writel, + tcx_dac_writel, +}; + void *tcx_init(DisplayState *ds, uint32_t addr, uint8_t *vram_base, - unsigned long vram_offset, int vram_size) + unsigned long vram_offset, int vram_size, int width, int height) { TCXState *s; + int io_memory; s = qemu_mallocz(sizeof(TCXState)); if (!s) @@ -233,13 +282,17 @@ void *tcx_init(DisplayState *ds, uint32_t addr, uint8_t *vram_base, s->addr = addr; s->vram = vram_base; s->vram_offset = vram_offset; + s->width = width; + s->height = height; - cpu_register_physical_memory(addr, vram_size, vram_offset); + cpu_register_physical_memory(addr + 0x800000, vram_size, vram_offset); + io_memory = cpu_register_io_memory(0, tcx_dac_read, tcx_dac_write, s); + cpu_register_physical_memory(addr + 0x200000, TCX_DAC_NREGS, io_memory); register_savevm("tcx", addr, 1, tcx_save, tcx_load, s); qemu_register_reset(tcx_reset, s); tcx_reset(s); - dpy_resize(s->ds, XSZ, YSZ); + dpy_resize(s->ds, width, height); return s; } @@ -253,11 +306,11 @@ void tcx_screen_dump(void *opaque, const char *filename) f = fopen(filename, "wb"); if (!f) return; - fprintf(f, "P6\n%d %d\n%d\n", XSZ, YSZ, 255); - d1 = s->vram + YOFF*MAXX + XOFF; - for(y = 0; y < YSZ; y++) { + fprintf(f, "P6\n%d %d\n%d\n", s->width, s->height, 255); + d1 = s->vram; + for(y = 0; y < s->height; y++) { d = d1; - for(x = 0; x < XSZ; x++) { + for(x = 0; x < s->width; x++) { v = *d; fputc(s->r[v], f); fputc(s->g[v], f); diff --git a/pc-bios/proll.elf b/pc-bios/proll.elf index e274b0d19361deb2959c9de7d7eb420ab4b14579..f960c83e61a3fea4336aecc7090dca5fb512db66 100644 GIT binary patch delta 8592 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 Nc#1D8<>t`Y{{pfnB!vI~ literal 133338 zc-ri}4SZD9nLmE+oylY}1ei<`%o}hs2@o(~M2d)LMny|4Dphn@Yi07rO9>=R0!7!t zfFV*>+aW|st*b+%h}M4_scWrk%dDoqg>=D7dXm(M>*F~_BzULM_CLnn`azl zhyI%m{Wpgk<>QX>F-O^<|7Oxr{<)*<(0|jR|E5F#O^5!Q4*fSB`fob)-*o7|>Ck`E zq5q~s|4oPfn-2Xq9r|xN^xt&ozv<9_)1m*SL;p>O{+kZ{Hy!$KI`rRk=)dXEf77A= zrbGWthyI%m{Wl%@Z-yP^+Z<(w{+kZ{Hy!$KI`rRk=)dXEf77A=rbGWthyI%m{Wl%@ zZ#wkfbm+h7(0|jR|E5F#O^5!Q4*fSB`fob)-*o7|>Ck`Eq5pVcHyrwJIP~9e=)d96f5V~whC}}ihyEK5{Wl!?Z#eYd zaOl6`(0{|B|As^V4Tt_44*fSA`foV&-*D)^;n07>q5pVcHyrwJIP~9e=)d96f5V~whC}}ihyEK5{Wl!?Z#eYdaOl6` z(0{|B|As^V4Tt_44*fSA`foV&-*D)^;n07>q5s06|H7gF!lD1dq5s06|H7gF!lD1d zq5s06|H7gF!lD1dq5s06|H7gF!lD1dq5s06|H7gF!lD1dq5s06|H7gF!lD1dq5s06 z|H7gF!lD1dq5s06|H7gF!lD1dq5s06|H7gF!lD1dq5s06|H7gF!lD1dq5s06|H7gF z!lD1dq5s06|H7gF!lD1dq5s06|H7gF!lD1dq5s06|H7gF!lD1dq5s06|H7gF!lD1d zq5s06|H7gFVwnDqDX`3Y^BRV7L~Uw&UPbDqJqxLge3m6dqSFeQU#y9_yTo2`PfgO@ z2TgD495y85$ zJN=Kww``9Mvwg1Gla*WjVPQXiNQBJiu?NjVeKcT+{MwT%y8{hT(8opX<3S-Jy&}hR zFm*O+T5hy!IutCQhk48`(eSXbK?5(X6YCaRb|;5Dy9ayTE!&6Jp*&13LPD(6{FCJ; z{gvVge}y={EfRTaTPSiq=6<5EZq-{^Arbj%NSG0kMeP7j06b_X ztK(BbqPHL>_PS&4E%#Z&@#_zXEw4nxmKT%WfnK-#PHa`*0|#`uTbG~E<$K-YYjcvG z{bQ}ok5?xRz}fo?MIp+mEe}{?%P}GUlBF^6Mrq7@tTg67UK%SJDvenuOJh~1N@F!= zN@Mf3B+-ukM#1UttCOC4bHbZxo+tbw>q)=xJU%CBpg#NFyift2rDXpdVUfHPb6twL zF2!7zVy;Uu*QJ>2Qp|NJ<^n$V`bFV=elcOR`TpVcgS(0M`308f^9ye|VDRh5(Li|- z>dPQEWh6f#k^9;1K-f=p1Mc#9k>0SF06z5utfD;ON<{+|sctjmjrxTTZJT$_4;O$R z)lu*wiS~&pVX?n3ET++1kj3N_%bQo5@_*eg^5au1a7lRg6}+~fu=eB-$tlLk4~a2n zE6{$5$Q9jw;Rjxg(So|_nW!6Z*HuT|A`r!#Xm@{a;hyHg+EYX5mxuBY<`|-NseZZt zhV?8$|I3s-7R*)OIS17DxJ~rkgSOpSmK)DI5?Nsp13d=aN$*}W63A0@sCv~M_I_zj z%y%SfPcz1yjd{>N{{gHM(wo0W%5ASD%!8@-qck3Lum^v;@K*{Ic;v;9*zG5Jj(Is+ z_}YRHxDlODUbN-=NiXrs<_GXDQaI;+5_lEU^Bu>8ciRlh=oAs}wyKy*e;bilOt@hi zJ0k~E0q6pKlgtt>a=fxdn9p}*z7XD6wKaX?= z>gR#RMBjhG8i@DR$)L56<616ptrW3>@&!HkM%%||-TOd0s@HYBRJRv(SWA8$@zeeK znWzWy;*NNC%(mRX!AJx{qTAejCej=7&4pc}GR7wxRK{1_t-;{}MOyFnYQ z?U`6*jfm_O1>S?HQ@xd~0&A^Azu(J#o=^_PsT`&6W6r*LVlw8k1oe&Kdz5}(cJ@0l z)$+bMRfspHT5cylAxlMlf%1*rvai^Nv5H7ez>9Hx{@T<~r4UpXue7`*Gx*N!QQ!VP z_3b`vTBHNtIAU74eEg#x$lN|D1F!_5WG{3sF)jp;Qk&W_!z$V_-=evEu%&qiJYl0C zBC=5)i@$7B`&jbL36JGQd7SN=sZ2UUc%dAO>?OGsmrxnsQ*?cquD?i^&x=pBa`oCg z7{eR&Y)*kDUh>}w&<6g-z_%CAatG+SDRKtgVe}C`AMnxRO_ub)Sb%+!UZ|gQF!eI6 z4Rz;HUEkD*pVIOadr^2<>LS^ zH`%ygM2rUx-a+6Q>5Wl&OkCnF#9@!*$G48Cb>z}o$p&KlTxt_%azOeR1)tToHLPsw zDQsi)6v)cHg5;tKEi-!y_9S`>>cIyiOg6Dk+7eMrcCH&f6!mwJj*)Caw(@%XZ+2Ny*A;?rJQE62TR9n?=K<3_ryv3`nnF)8yyK}xZc?;+? z;7+FFu;`s42krd>u+Tf^hv~UD;ZCOGvhF*vUdZZTrBw+TEyJIMKa%4DzIMIF?U8+9 z;eo6j1+73ce`H@Mrv$P_@;fymE+Sn3t#c#$B0kjnBKwlm9x@avB|grJ2=kd>s5tVN zMgGSf^+d`bS5v4T$qzk$HW(>60{#p@ra+fm$d-54?eUy`msRWQF7&>y3CzNY=4Fth2E^Y%y%;e7;n_XBTQ zBjF01%|nP~ABo37kGPNHPJAMH(|pKyNG>;a$tr+Gv8V_mn?x@==8S8RWi<_&t~8dTONDStdMWd;#7b zQ8dhjoL9j|xF1|Da(0=ilr8HIT4L-W!h33@Y}az(8dU9l{bsC^#-KigGqvr$HRJ*f zW=i_+OPZj|^u5GOh4-ZnygeFkH{tD-dKn@bUa0y1SK%w?2hQoXsAp{}hvA8KB=3Z$ zLss4azux)p$%+WrvV#3j8SH2Td!Pt#@^<>IF^8~+>JP&92Vv)7;|7D4_d&!sozk~} zt`#9MP!aY<9<{{b3dns$*bSTIidTgFyIoc`#>_!%kdsw=(!29g%Z0HQMgzg^o&Me< z=vUBR5w1B@5eAOoDjFaCs*BOSwDzQr`s~gxZ+tL6+}i1n?Wa8&aH%1jfRFbu@B%&s zM}n|(b-x(`?pQPG(Z+ko3>S1Qi$fN|xri%Wv@X>7u_whkEkEiD zP*;GuN|Y;6u0pvAiNocQ;ca!yIuf)UW7I|hhXm#F3TUU zu*!hDi9av?e4XB;>rjPNL~--3VBC!KCW{~^IfpAOtIL}@L(dLH`hk0`*j5!8)8&nu zs4KJA)J1y%k+cv4P(L5l4Txk>V(UWL=a5L2p`WjFhA_MQ=-a!H`@M}vvtwb3B@-0q z>=jM@l_eh)R!}f+6pq87G@E7V%MT!UtTZ9X#1T?cf{nX>#75Q_O}rhh*FAgC`%DFWdYa zYcnFf*w-9Py-4vFXz?)7#-^j^VCpHNp{=L3Oh67uo=G$m z!CJDTzHs)oc`;WvWQAm=(-(#wT9Zjm1|Soi{)jhfk-S)wNnR2pFTTxOUe1E=-ajKR zlSh!3v;PO>Wy%Qha_}$6i^1e2^;gKtKPSF!+h-#Xz+Vh>uI>h#2OJ8zGedLLfARYb-_VoJ6sZ`UQllRLfP$@k1l zX5CYjG&_S4bI6s<-MU@M!}varaBU~w7z>rbZ)V*yT^OBKsBGJG$U{xs?C)}mPH)83 zbwLQS3VXcIE&8x0!MIi=7B3?{ZTBRNPTB*Z{=HbI*b1LzKgT*x(=!^M+CJkK?kGRz9FzuU4w_Ok}y61whpZa|3f-wACr1W9XY`Z@) zQPS&CNv}&Ky$~CKUhWg{wM4HW#D<+NqFKo7^av9)D|rqy>lzPz3r1YeY)`sqfBM|` z&1bgFO1ienSR+of@!V5|K2zgmMC)yUC4KH$sOU3Ys5LycP&}6%c6WJ_Zks+^U6MW% zsh)DI&k%j|b4{O#GzZ#_d6;so_8c=p<{^yVRTVcobF_Y9d}>2$MBjg-wQw3e{3Xfz ziJ(*23t02RmKfi;EL405bkH*5dKPQe`xdf4Wu4j9iz6M59P7DW5;* z5yf31>FR`Ul6hdzOh23SG~|u;-SRp1MKoWhIGCcjFsJ$7ov(8$)*KT?8R}^+s^2*; zX?BgbCOwAH%MK8Yp%>t-e>>!& zQ^~xSV#TMbA_n=|zPUouyT7ZGh#a z@I@43UGD9MY3O(~~J3nL&buAQ! zwzvh^?#@||NvR791+~Gta?v;OTz06G^BH3kk4v6Y_O?{(ydSbrHk2JM*lK}Sw~OMZ zJt5;ub1m~wb~v~1cB~uz;IH&KigCtU;IZW*Z+(sOnc7p;K_e(6=CviIep+c_-~*rWx(eD0cjJ%uxDbt z=D(ZP0bFvQCci%wIzW0}4Vw)96K=y~0QgWl@E-f~NFK)c_Osc-%j94q<{y)|J|y>t z@UL0jDks)Sxt*GbSO|Cv`8M5V3jEPKlzY?VMv5h<47kOl{Zp^C(WL!TueB^d`H)_# z;c3Xdex5zxIe3Qp(Oi^^^-G^_`DibKxn{`R+riYEG=4yh*G~PrRsAm#*UQ{6joVE1 zNsO0RoX%DMJH-hYXDPL}>w)tbsz?6>jjQpyVfMk)D^%9_H4|X*p2=LKvo#Ur|1E%zy#v#-4X4S^UU=892_@r*{!4&p6 z=0Htcz=l&B*I_*CuTgFK1J*o(NnVThQQ!k06f0zH!)QPF^&7S1$ zs3-Z*!=B{BaVu$UrChU>EbH;t(038^pcLPg&l%-K&(gEGanV1{n%qANIz7&sbO^p0 z<#LqWC|f9JpRc5BQHiFkXz=8rhsWQ4=qr`JT<5>g}Ipl_q9cCBM8-lptR6#xD+)ltCwHUYh5^ z+ElU&^BnMnT+|14ps0UtGH_yU(tp4g;dK*GR}i0yee~31t|RwcrDdg(@=0%)(0>R@ zC*c)oi8-)Li>0gtDgP}E;8y8YIbgv$W^$-Z)J*_3x1!2UmB()ifF1w+D-x7+g++n3*S!={a|kk z=^JC5N4SG-woG`U&<9<2CNTrwC=Y-xyFgpeC5O(-MxqJmE9W4(IB9&;&iSkLd){z| zy;7$=J||`-ppbO_+?_i$61fk1@;TBrxUlBS6M!T4RZ2S$ zxi3h2+y(M{3~*4=FIc-dqqXds5zobX*7nGJgykkYsjb#) zkIaE&^x7i522YkLA9(gEI@7}U*Xf()#26tO1Msl3xg_YBUwbmQJ5axuWVA=>NiJ-y z!Z~fTPzG+WPwqvqId2ocwJmg$-5GSJ?Ug4V>q38j)F*PtZY6@TT;Ot{#;q)>)?^S~ z@FR4-2RS->H`UX<2}eGmh|U*}n3NB;-16)NZ4L*m0x6p_(0_K!e04V2#W8OuT$!^n z^p7SzVK1E#Bs}4Q<8C^4lxw>5E$C)N?a7q`h&K}MhWnyHkwbA}0r?E2FEtd)4;GT$ zt%zaWz5&D}G#>56K@V?ycGw)89ip|`zUn;c8&Y>Twi8XrXB@_Z0m{Jy!jXYs9DI8B zsN^4>lMD<>K4KnU?dAl84)&u;(=V6$C4ynl@BP<6i(-7gLUbaWN#_$&!|s7uVbCyK zp!D(Vg@7rh{WRs=qpD58G3-yjv1oXFxV7;2V$1g7_mc*+?HWnONfuz^NXBy`U$qus z&6E%GQr(vOlg|62*UIw>w3`aK2M-pI?)M-R?)HVp_XPUHju~O&G1zH3v)+{zerRxZ zJRd&DL*<^V@WbSf;jU3B)J7ug#rARpgd8G-k7t%|xs1>ISp ze60EI#EkHR=OOmo?Y9<{5}z@*%+U!do^# zH2pJlp!kF6jWuR#-Wx$W>jF&mOdjMNy98v2a&ArPYn!eKz(nQ&38X4{KuKb_r9wQAHpQPvSIbU&b4_L(YUyLnWP zzLcYNQ!F)#9x9o~bEgi<^W%H1Y|KOVl_o_&Z?co{w__n!W4i+lCwl_1o?U_DAYvMC zq7vg&T2;i;LHJ-5TVyYT538w>engO+UV@$9DWco3J1vv^6u+UpA=lci=$s9lYiVw3 zkA83A*>;R|%fM85AH%KqWWIs=KDtAZzd*p22yvbzM2{~5dlngkrBqSuR77-D_PLn) z<@sq}7xChGNw<8zQ^JOm)29&R{D@$#5cpI;wcC?amxiWq-dopL^S$d2X zjIpdn>MQJb<(_JeAKj-qUqr+{>bEykT!J`|eB6H6M%W9tx+{m+P`K$n&iM1tc1LyC zHGr62#}Dqk?ilv|mbcd(Heg4KeFsy2+~icYj74ldnNK3RVjS4C@{OBQZ~qOoqdRnf z$^I4Zmv`(aZ)03y-zN*I9D~%CZgn5)a`ca)&(*XSiOnPbN-@pbS14Y-eFe4Or^daU zp7qLcMF8b_Dqlf9{OymRt^mCA2ef`f_QnHb7fIK__bT9V-Y9FBsMj#nUW3MajE%RW zeIDV=aGjuWo#4RFukM9~{5s~Fr0-2)uV%cg@iLu0t9RT5DY}z)z#S?^+vWqFmQ>%k z8u87!;atSv5&eF|bucu>W&EHOn$Lr%wJnYKDr`9xCjTcGb6e zD5L)d^uIh_qi9C=39}G)xSeq*qep`7g3&$F9dpC9XQnw`jCzEZ`b559(b-ESYoA2> zzXLArzHzkzef+c^LZ4@%6NdFUkM%i*KI>Q?pYHRxqmR$-gZB04C)d?It_A+WxEeDY}C?@*Pl7^k2I>DtsUI?kMpK z_?PSf&rW(^qP`F#d7vDA8OdIc%%hZ(&HNY8YC%u8)TP<9R>YQw|I|94#yU?vGGgtX?*nQc87Ah%}CD9*zQb7pTJx>bdQW|B;iCkF5q=J{=OTPXW4YeMwC!J@%sZYhq^o7 z1RvK(wv+Vo0AjG#|6Q5y{x15R?^)s>tjOYs4ZDf zW!fXefs>47@vZI;h0-xc(k$<%d%2VoBt5H8`xYT#> za{rl|bnlUUXCsEEKI!~-(4xCka;|}(x<4969o_BdvV^Z6`)N8OJM6ODog(6kdLyn# zuNYH8_Ryp~acE2xXgN?}rSIC>JR@1qcO-sCwzIE0v*!V?+&m9YcOxRb($>r08Hvxx z)CK5%ziAov*mSl)_YUY>hsymvRo6cQaU9y|I|-+0FE>J;yj{d&UtDafiWMEYHbnXT zBFfE1V-eDKAN3=Cm@39j_XX`vQa`>UC@$>w@>~Tt^j|Av-E8&FkHjMy6fVj+ zV1Lk5TzfKWSKzgx-T4*n6Vqag$o`(37F!(6J~;HwwAhlK?AW4H(_%~Cn-*Jkc-q0C z&8a_KeuVaj4xaFo*;3vIwuN^RzhxRd7P(N>UTnOWY zeCXr-=B#iLV6UR2KP8-4b36!-3}?33{`V&8Ykha|FMUK%qxMR*6YVq{lyX&mzLI?kp$G~PTT zmFfXacFeKdG)~l~d=UI!7qugwhcW*IIddPI8X4wm>AjIWsl)F-g?*@7=f$&=@K>7O zt>E`Oo8QH?2n>YG;Wnu~Wch+Yd_OijTt?*wX2*&SW6#~~+x+^Gsl?-O)?Qz1`~dcB zbZ?yQ5yPM4J~|^z`SU!CPxQ#sdrWU3XsPWhJ^KXaUSiLU{gk`M6Ou7Tj~Vje*+$Gq zdYzBGk9#-e7BNSUj2}~19)=B%7m8@#%e};$7YH4u*f{jHChoRejj37g2fcg1&TjHCQj=_}ihMLoUX22kH{U z!xO=fm-&!Iu4g|f&FgxKsx>P@37*%_R z8SpjL)OWyL_X=!95sfhjdz+XMrsqLg2R$Fe^DpV=hiAmh#Eh7W`d}RM4a7k79PKBZ zm=VkR;CNvV#>-Bk4tq~p*LcFETjJ&VCHb_$an`uRIBWa^Gh#(pqo2lz29%v5TZ89$ z3H0v{L~_vQM|4(2bIA9+OtMwMMc`vA@saB38}*RSvulWM@JqkPT0Ar^`L3O_Deq!F z1^mm@dtsL5do7*ugCCZ-Q0=2y`z8dRg}knmx@ZQMM)nDk-v)}4^Crhh|K*(;)ZN}Q zN#-A@-EEP3m7J50Pnbcsj%#jHahc?)+;i@QY|o8|Pdrr}GZbG$|DWfJc;4oV{hV?X zn%3Y=*tJ{cswIDn!)gAAuOInP{1J~a{%j!rB;{E0zCa9ZiuAJ<6^|%B5Y06o#t}~> zzpz%=ycGBqK;JLeJb*4vA|CVvdY=U!ZXiB{L{<;J$KyL@zXM47Hs}s_?;z?ANzanu`c{W!(7(2%hxIO%aiewgw&Cwm5^vxClG9eocOCuKm!Q{sV277MuD`|j=TZLc{b$iXj_;RL zoR~Fcgf`zmnGjT5->P5Opd(Jop+JJOkGEw!QdaqmH&E^m_hxF`;y zXH+latr@~+$HQ3jtCWkY0C{6lx8HA#s=LHqm0xgOF3-8T<(}mxmD^Rnl}53EC!NDG zzj%=d#k(ied9{q@DtejnEE4tEy548!h%r|k=r)A?(Pe12nfx%~jnLiz#YWa-dRH;# zu1&J`H)9P&Xn!HvT4)Qu{eF3my6^1ib%*>q#;5vHDg)OmY+MT{#z71K{qsVORPF(L zShOYDP|R9N^H6;Z^{88e%cd8ec_b8dv+2u%fp^z z2tL$M^&*eXx@jyYohqb0gGL4QVcsLIqjuUREdzj8XK~E#s>!D`FET-k>!=}g%ozbN--iApOMu$yASgv^_lS3?f}p73>?pOJs~F4?-7 zYHbTK*HuwxkSK z%HIjx$<88{rh6rXTi-xsy*w{h?~6*DJ_i3=+N1PXo=4F;aP+<>=~K*a%}TiIz4|OQ zALUxiCGR%woF(s^Os28>%*{!}9j*e&V`~B3-5{LjsQjzmH=S7#Evz_Fb1?OjNbjEW z-ISBZ`UZT~alJS6>;1%X&?TkiY>cf-O8?K0{wL}F2l*zH5&u`bRHNntEzews@+nT^ zLQSgy$N=IU$N*w$EdxXwdPiU&*lXu|C#w5NlCPK9?*Im+y`bMlFm54P2Mz95=b@?| z<yZ9l5}Zc@0O^>JUJ^P2Suw>+nozJJ`B{upPhak<4qbw`vEgnMR^r^pO59B>U3Ykm=@Vg>@BSz;8jtx;(5xgbZ_09 zDwFwu+BeX)0e*fS-~aT;{ZFsFZ%VSN_dI4L=uP_}^3znWeKFa+`hJmg>pa8T*cZ`V zm-+!K=^nIXycy#0$X>Zu5FaIZ?A5H7w#Fu^=^c95FT{m}1D=10=6|D7?&<3fn-<-h$s072HIKXyA)7VE z&iT{)w#`;@clulCyUf9>hJ-sf$Ij(ZA9_FD{;isLWpEDqJ&t~n(ReI#fR)w)#i!G- zT~>_BynVMkBUvH5>U?gplAY5#>8!FwojuatkoLMOqrTcW_8mF$J_2NTa7JA8nMrpd zn9Pj_lYacsS;jbg(^z%#{YuC~;@Y@<7x;HOXHc9W@3{tPZ@bG(mO1V4kVo$Q>tF+1 zBv0MJP!a7*<1<7~4EA7fG092Hmcz+PCr+=R^U^qMrae}_Nx8g84#`A+(DLec?{l$t zFQ$7FgYvfo_6f2pv?diV3tK*l={yzVF5&oL%v{>1)4SjUK`Ymh|0|~bKKf7&pv3M& zcWwK<$y|z|65ixk?B7ftyD7X7@M6t7utzBd@5yiM3M5z2K7G&?oG16~wCA2-+4K`n z(EH~V!Fiy=HAL%tk{Pppj+V14_WDK6e!nQBcmHAkCnv5=8ojcw)Ztk%&_0nBoJTx_ zj;3gg#FXH?-33Se@fk^q&9P@ZidZ^k7SQ|IF3UUMl6Ok|^4QF)lZQ@>x) zJEupU8^?mcCx_lcOJvp0v(NYv?%p{XkMGl3(>z1`3O``T{HIUm9_YSp4#mQBCqLn{ zTq;k9eZ}l>(LJ-n{s(4K$qy zr*?tYLd28AwXcN|zKBqLLH}zb_MLi}1E#jod}|@W@C)1M9;CxYaQtsqcjM0dPTgIz z7OJ(J`Hfl&<;m#YiP28&oHmMbjlBiIP`5uw=V5v3odM(HvQzG zGq5YQ6fgF9YR~9rXYp)omS5aIJyk4Z=!;yP+%qw#{ki~%B z50sOf7lh4NL3spipQW+seyh3*_TH!Ho-4*7zePC?mvbD-OYEqQ`SslIqt6mLFGimL z`s}54s!!Ntea6tdlxN1g6h}RXzGrr-oJv5?eL2nTh=m&|7Yx6+n9lPMZ#5$Jnmh&H z(AmabwLi|k5OnUA=j5q6eZH`VVhG~7hwfZe_AWVEd333cE4KGd2reXFj=lX^_<-|d z-0w#Fy;jbgi29um;5d!w^`&a~d!JRi%lBFwcuv@5zCm|8uBLn-`I~_$!9`lOl4|_- za-)THai`6O?P-MVS!(+@vORRyrBB%J)zSDPoc%Qtj)>VBPs|Q3J2|`l)}dhUD%kNW*&PD{_qIKmx( z?Y$nW0Q48v80Aj=yBV;X zXU2j~_FdTy%{Ldur98z@H~b;lGKz2UyjhK7(Y?()lvl|zz`gloV%ouDC`Tv;1bke*$86;u0iB}R2ag@b*heln_=m$6A3On` zPK{qcXHTb}pgGyS_~Jg3?wp=}ygPFj#;@i&{Rqv!XNI~nzh{o+*YU{1Y>(|%G1#9j zgDp8i{Tz3COQ36Cq2J{B2-XOAAIkw{B|N>YI)0MB-8V$#eUe9zJ$jeeB7c%oDD66Y zqS@QAId$rfJra-i*UIz7slBayPMU{g>`hPa#>l?X}ViffI7Ft z^$THx_UiFDF;BcYQrrh0cmd_&-I1b1*3qSCfBj6deQt}+RlHC5ExNZ|s%+@#k0!Eu zS1EZpJ3-#%uBLNX0ew4t*<00C4*Zv|+e7=~)09^V5D#@OFbg<%y8R2VPiROH410F< zUQf6nQ5}bUMEqKf_{g2iCHs&5(@EBdrdXdjVD>hXKZVRSBSxd=uH;?8d-2>H0 z?_1T$ocNri2Y)_1FU#Qi{%pVkaBnEpKtl!ud%GjufTnD4re>L8NcxFKK zcGB-y&>21AA)~({)=2j7P%s$HGP?Hk2Sf7g_o0e|QQKAyn8EEsbf*7>ODX?CciDj7 zsfX3wbQwQ4?xgn^0>Pd^#OrpfPJ4OU3(*|~ddIO)+g*~mBW6AJ&%rS5la$<^YCG(b z`{>4e3o)nJ+ljG#gC^u+MkFT>xRI?Xk?#%0DCb?M-t9TsN%tGi!}G(yo%ZLHpOL={ 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 diff --git a/pc-bios/proll.patch b/pc-bios/proll.patch index 18a157512a9..5f2e027d490 100644 --- a/pc-bios/proll.patch +++ b/pc-bios/proll.patch @@ -1,6 +1,6 @@ -diff -ruN proll_18.orig/Makefile proll-patch4/Makefile +diff -ruN proll_18.orig/Makefile proll-patch7/Makefile --- proll_18.orig/Makefile 2002-09-13 14:16:59.000000000 +0000 -+++ proll-patch4/Makefile 2004-11-13 15:50:49.000000000 +0000 ++++ proll-patch7/Makefile 2004-11-13 15:50:49.000000000 +0000 @@ -4,6 +4,7 @@ make -C krups-ser all make -C espresso all @@ -14,17 +14,143 @@ diff -ruN proll_18.orig/Makefile proll-patch4/Makefile make -C espresso clean make -C espresso-ser clean + make -C qemu clean -diff -ruN proll_18.orig/qemu/head.S proll-patch4/qemu/head.S +diff -ruN proll_18.orig/qemu/Makefile proll-patch7/qemu/Makefile +--- proll_18.orig/qemu/Makefile 1970-01-01 00:00:00.000000000 +0000 ++++ proll-patch7/qemu/Makefile 2005-03-02 16:41:50.000000000 +0000 +@@ -0,0 +1,122 @@ ++# ++# proll: ++# qemu/Makefile - make PROLL for QEMU ++# $Id: proll.patch,v 1.3 2005-03-13 09:43:36 bellard Exp $ ++# ++# Copyright 1999 Pete Zaitcev ++# This is Free Software is licensed under terms of GNU General Public License. ++# ++ ++CC = gcc ++ ++#CROSS = /usr/local/sparc/bin/sparc-sun-linux- ++CROSS = sparc-unknown-linux-gnu- ++ ++CROSSCC = $(CROSS)gcc ++CROSSLD = $(CROSS)ld ++CROSSNM = $(CROSS)nm ++ ++RM = /bin/rm -f ++ELFTOAOUT = elftoaout ++ ++# ++SRC = ../src ++ ++# Due to remapping algorithm PROLBASE should be algned on PMD. ++# We make PROLBASE a define instead of using _start because we ++# want to shift it to form a PGD entry. A relocatable label will not work. ++# Linux kernel expects us to be at LINUX_OPPROM_BEGVM . ++PROLBASE = 0xffd00000 ++PROLRODATA = 0xffd07000 ++PROLDATA = 0xffd09000 ++PROLSIZE = 240*1024 ++ ++# Linux ++# Fixed %g6 is for arch/sparc/kernel/head.S, it seems ok w/o -ffixed-g6. ++# Kernel uses -fcall-used-g5 -fcall-used-g7, we probably do not need them. ++# __ANSI__ is supposed to be on by default but it is not. ++CFLAGS = -O2 -Wall -DPROLBASE=$(PROLBASE) -DPROLDATA=$(PROLDATA) -DPROLRODATA=$(PROLRODATA) -D__ANSI__=1 -I$(SRC) -mcpu=hypersparc -g -DQEMU ++ASFLAGS = -D__ASSEMBLY__ -I$(SRC) -DPROLRODATA=$(PROLRODATA) -DPROLDATA=$(PROLDATA) -DPROLSIZE=$(PROLSIZE) -g ++# Solaris or Linux/i386 cross compilation ++#CFLAGS = -Iinclude -O ++ ++LDFLAGS = -N -Ttext $(PROLBASE) --section-start .rodata=$(PROLRODATA) -Tdata $(PROLDATA) -Tbss $(PROLDATA) ++ ++ALL = proll.aout ++PROLLEXE = proll.elf ++ ++OBJS = head.o wuf.o wof.o main.o $(CONSOLE) \ ++ printf.o le.o system_qemu.o iommu.o \ ++ arp.o netinit.o bootp.o packet.o tftp.o udp.o sched_4m.o openprom.o \ ++ vconsole.o hconsole.o rconsole.o vcons_zs.o ++ ++all: $(ALL) ++ ++$(PROLLEXE): $(OBJS) ++ $(CROSSLD) $(LDFLAGS) -o $(PROLLEXE) $(OBJS) ++ ++head.o: head.S $(SRC)/phys_jj.h \ ++ $(SRC)/asi.h $(SRC)/psr.h $(SRC)/crs.h ++ $(CROSSCC) $(ASFLAGS) -DPROLBASE=$(PROLBASE) -o $*.o -c $*.S ++ ++main.o: main.c $(SRC)/asi.h $(SRC)/pgtsrmmu.h $(SRC)/iommu.h \ ++ $(SRC)/phys_jj.h $(SRC)/vconsole.h $(SRC)/version.h $(SRC)/general.h \ ++ $(SRC)/net.h $(SRC)/romlib.h $(SRC)/netpriv.h $(SRC)/arpa.h $(SRC)/system.h ++ $(CROSSCC) $(CFLAGS) -c $*.c ++openprom.o: openprom.c $(SRC)/openprom.h $(SRC)/general.h $(SRC)/romlib.h \ ++ $(SRC)/vconsole.h $(SRC)/system.h $(SRC)/phys_jj.h ++ $(CROSSCC) $(CFLAGS) -c $*.c ++ ++system_qemu.o: system_qemu.c $(SRC)/vconsole.h $(SRC)/pgtsrmmu.h \ ++ $(SRC)/timer.h $(SRC)/general.h $(SRC)/net.h $(SRC)/romlib.h $(SRC)/asi.h \ ++ $(SRC)/netpriv.h $(SRC)/arpa.h $(SRC)/system.h $(SRC)/crs.h ++ $(CROSSCC) $(CFLAGS) -c $*.c ++iommu.o: $(SRC)/iommu.c $(SRC)/pgtsrmmu.h $(SRC)/phys_jj.h $(SRC)/iommu.h \ ++ $(SRC)/vconsole.h $(SRC)/general.h $(SRC)/romlib.h $(SRC)/system.h $(SRC)/asi.h ++ $(CROSSCC) $(CFLAGS) -c $(SRC)/$*.c ++vconsole.o: $(SRC)/vconsole.c $(SRC)/vconsole.h $(SRC)/hconsole.h ++ $(CROSSCC) $(CFLAGS) -c $(SRC)/$*.c ++vcons_zs.o: $(SRC)/vcons_zs.c $(SRC)/vconsole.h $(SRC)/system.h ++ $(CROSSCC) $(CFLAGS) -c $(SRC)/$*.c ++hconsole.o: $(SRC)/hconsole.c $(SRC)/hconsole.h $(SRC)/rconsole.h $(SRC)/phys_jj.h ++ $(CROSSCC) $(CFLAGS) -c $(SRC)/$*.c ++rconsole.o: $(SRC)/rconsole.c $(SRC)/rconsole.h ++ $(CROSSCC) $(CFLAGS) -c $(SRC)/$*.c ++printf.o: $(SRC)/printf.c ++ $(CROSSCC) $(CFLAGS) -c $(SRC)/$*.c ++le.o: $(SRC)/le.c $(SRC)/dma.h $(SRC)/system.h $(SRC)/netpriv.h $(SRC)/romlib.h $(SRC)/general.h $(SRC)/net.h $(SRC)/phys_jj.h ++ $(CROSSCC) $(CFLAGS) -c $(SRC)/$*.c ++ ++arp.o: $(SRC)/arp.c $(SRC)/general.h $(SRC)/net.h $(SRC)/romlib.h $(SRC)/netpriv.h $(SRC)/arp.h ++ $(CROSSCC) $(CFLAGS) -c $(SRC)/$*.c ++netinit.o: $(SRC)/netinit.c $(SRC)/general.h $(SRC)/net.h $(SRC)/romlib.h $(SRC)/netpriv.h $(SRC)/arp.h $(SRC)/ip.h $(SRC)/udp.h ++ $(CROSSCC) $(CFLAGS) -c $(SRC)/$*.c ++tftp.o: $(SRC)/tftp.c $(SRC)/general.h $(SRC)/net.h $(SRC)/arpa.h $(SRC)/romlib.h $(SRC)/tftp.h ++ $(CROSSCC) $(CFLAGS) -c $(SRC)/$*.c ++udp.o: $(SRC)/udp.c $(SRC)/general.h $(SRC)/net.h $(SRC)/romlib.h $(SRC)/netpriv.h $(SRC)/arp.h $(SRC)/ip.h $(SRC)/udp.h ++ $(CROSSCC) $(CFLAGS) -c $(SRC)/$*.c ++packet.o: $(SRC)/packet.c $(SRC)/general.h $(SRC)/net.h $(SRC)/romlib.h $(SRC)/netpriv.h ++ $(CROSSCC) $(CFLAGS) -c $(SRC)/$*.c ++sched_4m.o: $(SRC)/sched_4m.c $(SRC)/system.h $(SRC)/general.h $(SRC)/romlib.h $(SRC)/phys_jj.h ++ $(CROSSCC) $(CFLAGS) -c $(SRC)/$*.c ++bootp.o: $(SRC)/bootp.c $(SRC)/general.h $(SRC)/net.h \ ++ $(SRC)/arpa.h $(SRC)/romlib.h $(SRC)/system.h $(SRC)/bootp.h ++ $(CROSSCC) $(CFLAGS) -DNOBPEXT=1 -c $(SRC)/$*.c ++ ++wuf.o: $(SRC)/wuf.S ++ $(CROSSCC) $(ASFLAGS) -o $*.o -c $(SRC)/$*.S ++wof.o: $(SRC)/wof.S ++ $(CROSSCC) $(ASFLAGS) -o $*.o -c $(SRC)/$*.S ++ ++#genlab.o: genlab.c ++# $(CC) -c $*.c ++# ++#genlab: genlab.o ++# $(CC) -o genlab genlab.o ++ ++clean: ++ $(RM) $(OBJS) ++ $(RM) $(PROLLEXE) proll.aout ++ ++proll.aout: $(PROLLEXE) ++ $(ELFTOAOUT) -o proll.aout $(PROLLEXE) +diff -ruN proll_18.orig/qemu/head.S proll-patch7/qemu/head.S --- proll_18.orig/qemu/head.S 1970-01-01 00:00:00.000000000 +0000 -+++ proll-patch4/qemu/head.S 2004-11-13 15:50:49.000000000 +0000 -@@ -0,0 +1,515 @@ ++++ proll-patch7/qemu/head.S 2005-03-02 15:30:47.000000000 +0000 +@@ -0,0 +1,539 @@ +/** + ** Standalone startup code for Linux PROM emulator. + ** Copyright 1999 Pete A. Zaitcev + ** This code is licensed under GNU General Public License. + **/ +/* -+ * $Id: proll.patch,v 1.2 2004-12-19 23:18:01 bellard Exp $ ++ * $Id: proll.patch,v 1.3 2005-03-13 09:43:36 bellard Exp $ + */ + +#include @@ -167,6 +293,31 @@ diff -ruN proll_18.orig/qemu/head.S proll-patch4/qemu/head.S +_start: +start: + .globl spill_window_entry, fill_window_entry ++ ++#define EXPORT_TRAP(trap) \ ++ .globl trap; \ ++ .type trap,function; \ ++ .size trap, 16 ++ ++EXPORT_TRAP(t_zero) ++EXPORT_TRAP(t_wovf) ++EXPORT_TRAP(t_wunf) ++EXPORT_TRAP(t_irq1) ++EXPORT_TRAP(t_irq2) ++EXPORT_TRAP(t_irq3) ++EXPORT_TRAP(t_irq4) ++EXPORT_TRAP(t_irq5) ++EXPORT_TRAP(t_irq6) ++EXPORT_TRAP(t_irq7) ++EXPORT_TRAP(t_irq8) ++EXPORT_TRAP(t_irq9) ++EXPORT_TRAP(t_irq10) ++EXPORT_TRAP(t_irq11) ++EXPORT_TRAP(t_irq12) ++EXPORT_TRAP(t_irq13) ++EXPORT_TRAP(t_irq14) ++EXPORT_TRAP(t_irq15) ++ +C_LABEL(trapbase): +t_zero: b goprol; nop; nop; nop; +t_tflt: SRMMU_TFAULT /* Inst. Access Exception */ @@ -294,6 +445,8 @@ diff -ruN proll_18.orig/qemu/head.S proll-patch4/qemu/head.S + +goprol: + ! %g1 contains end of memory ++ set PHYS_JJ_EEPROM + 0x30, %g1 ++ lda [%g1] ASI_M_BYPASS, %g1 + ! map PROLDATA to PROLBASE+PROLSIZE to end of ram + set PROLSIZE+0x1000-PROLDATA+PROLBASE, %g2 ! add 0x1000 for temp tables + sub %g1, %g2, %g2 ! start of private memory @@ -397,9 +550,6 @@ diff -ruN proll_18.orig/qemu/head.S proll-patch4/qemu/head.S + bl 1b + add %o0, 0x4, %o0 + -+ sethi %hi( C_LABEL(ram_size) ), %o0 -+ st %g3, [%o0 + %lo( C_LABEL(ram_size) )] -+ + mov 2, %g1 + wr %g1, 0x0, %wim ! make window 1 invalid + WRITE_PAUSE @@ -533,10 +683,10 @@ diff -ruN proll_18.orig/qemu/head.S proll-patch4/qemu/head.S +C_LABEL(ldb_bypass): + retl + lduba [%o0] ASI_M_BYPASS, %o0 -diff -ruN proll_18.orig/qemu/main.c proll-patch4/qemu/main.c +diff -ruN proll_18.orig/qemu/main.c proll-patch7/qemu/main.c --- proll_18.orig/qemu/main.c 1970-01-01 00:00:00.000000000 +0000 -+++ proll-patch4/qemu/main.c 2004-11-23 19:05:34.000000000 +0000 -@@ -0,0 +1,178 @@ ++++ proll-patch7/qemu/main.c 2005-03-02 20:08:23.000000000 +0000 +@@ -0,0 +1,173 @@ +/** + ** Proll (PROM replacement) + ** Copyright 1999 Pete Zaitcev @@ -558,8 +708,11 @@ diff -ruN proll_18.orig/qemu/main.c proll-patch4/qemu/main.c +#include +#include /* our own prototypes */ + ++void *init_openprom_qemu(int bankc, struct bank *bankv, unsigned hiphybas, const char *cmdline, char boot_device, int nographic); ++int vcon_zs_init(struct vconterm *t, unsigned int a0); ++int vcon_zs_write(struct vconterm *t, char *data, int leng); ++ +static void init_idprom(void); -+static void makepages_q(struct phym *t, unsigned int highbase); + +struct vconterm dp0; +struct mem cmem; /* Current memory, virtual */ @@ -567,20 +720,48 @@ diff -ruN proll_18.orig/qemu/main.c proll-patch4/qemu/main.c +struct phym pmem; /* Current phys. mem. */ +struct iommu ciommu; /* Our IOMMU on sun4m */ + -+static char *hw_idprom; -+int ignore_fault, fault_ignored, ram_size; ++static struct { ++ const char id[16]; ++ unsigned int version; ++ char pad1[0x1c]; // Pad to 0x30 ++ unsigned int ram_size; ++ char boot_device; ++ unsigned int load_addr, kernel_size; ++ unsigned int cmdline, cmdline_len; ++ char pad2[0x0c]; // Pad to 0x54 ++ unsigned short width, height, depth; ++} *hw_idprom; ++ ++int ignore_fault, fault_ignored; ++void *printk_fn; ++unsigned int q_height, q_width; + +/* + */ +void prolmain() +{ -+ //static const char fname[14] = "00000000.PROL"; ++ static char fname[14]; + static struct banks bb; + unsigned int hiphybas; + const void *romvec; ++ unsigned int ram_size; ++ char nographic; ++ ++ nographic = ldb_bypass(PHYS_JJ_EEPROM + 0x2F); ++ if (!nographic) { ++ q_width = ldh_bypass(PHYS_JJ_EEPROM + 0x54); ++ q_height = ldh_bypass(PHYS_JJ_EEPROM + 0x56); ++ vcon_init(&dp0, PHYS_JJ_TCX_FB); ++ printk_fn = vcon_write; ++ } ++ else { ++ vcon_zs_init(&dp0, 0x71100000); ++ printk_fn = vcon_zs_write; ++ } ++ + -+ vcon_init(&dp0, PHYS_JJ_TCX_FB); + printk("PROLL %s QEMU\n", PROLL_VERSION_STRING); ++ ram_size = ld_bypass(PHYS_JJ_EEPROM + 0x30); + printk("%d MB total\n", ram_size/(1024*1024)); + + bb.nbanks = 1; @@ -590,7 +771,7 @@ diff -ruN proll_18.orig/qemu/main.c proll-patch4/qemu/main.c + hiphybas = ram_size - PROLSIZE; + + mem_init(&cmem, (char *) &_end, (char *)(PROLBASE+PROLSIZE)); -+ makepages_q(&pmem, hiphybas); ++ makepages(&pmem, hiphybas); + init_mmu_swift((unsigned int)pmem.pctp - PROLBASE + hiphybas); + + mem_init(&cio, (char *)(PROLBASE+PROLSIZE), @@ -601,38 +782,46 @@ diff -ruN proll_18.orig/qemu/main.c proll-patch4/qemu/main.c + /* + */ + init_idprom(); ++ printk("NVRAM: id %s version %d\n", hw_idprom->id, hw_idprom->version); ++ if (!nographic) ++ printk("Prom console: TCX %dx%d\n", q_width, q_height); ++ else ++ printk("Prom console: serial\n"); + sched_init(); + le_probe(); + init_net(); + -+#if 0 -+#if 0 /* RARP */ -+ if (rarp() != 0) fatal(); -+ /* printrarp(); */ -+ xtoa(myipaddr, fname, 8); -+ if (load(servaddr, fname) != 0) fatal(); -+#else -+ if (bootp() != 0) fatal(); -+ /* -+ * boot_rec.bp_file cannot be used because system PROM -+ * uses it to locate ourselves. If we load from boot_rec.bp_file, -+ * we will loop reloading PROLL over and over again. -+ * Thus we use traditional PROLL scheme HEXIPADDR.PROL (single L). -+ */ -+ xtoa(myipaddr, fname, 8); -+ if (load(boot_rec.bp_siaddr, fname) != 0) fatal(); -+#endif -+#endif ++ printk("Boot device: %c\n", hw_idprom->boot_device); ++ if (hw_idprom->boot_device == 'n') { ++ if (bootp() != 0) fatal(); ++ /* ++ * boot_rec.bp_file cannot be used because system PROM ++ * uses it to locate ourselves. If we load from boot_rec.bp_file, ++ * we will loop reloading PROLL over and over again. ++ * Thus we use traditional PROLL scheme HEXIPADDR.PROL (single L). ++ */ ++ xtoa(myipaddr, fname, 8); ++ fname[9] = '.'; ++ fname[10] = 'P'; ++ fname[11] = 'R'; ++ fname[12] = 'O'; ++ fname[13] = 'L'; ++ fname[14] = 0; ++ ++ if (load(boot_rec.bp_siaddr, fname) != 0) fatal(); ++ } + -+ romvec = init_openprom(bb.nbanks, bb.bankv, hiphybas); ++ romvec = init_openprom_qemu(bb.nbanks, bb.bankv, hiphybas, ++ (void *)hw_idprom->cmdline, hw_idprom->boot_device, nographic); + + printk("Memory used: virt 0x%x:0x%x[%dK] iomap 0x%x:0x%x\n", + PROLBASE, (int)cmem.curp, ((unsigned) cmem.curp - PROLBASE)/1024, + (int)cio.start, (int)cio.curp); -+ //set_timeout(5); while (!chk_timeout()) { } /* P3: let me read */ + + { -+ void (*entry)(const void *, int, int, int, int) = (void (*)(const void*, int, int, int, int)) LOADBASE; ++ void (*entry)(const void *, int, int, int, int) = (void *) hw_idprom->load_addr; ++ printk("Kernel loaded at 0x%x, size %dK, command line = '%s'\n", ++ *entry, hw_idprom->kernel_size/1024, hw_idprom->cmdline); + entry(romvec, 0, 0, 0, 0); + } + @@ -652,14 +841,12 @@ diff -ruN proll_18.orig/qemu/main.c proll-patch4/qemu/main.c + */ +void udelay(unsigned long usecs) +{ -+ int i, n; -+ n = usecs*50; -+ for (i = 0; i < n; i++) { } ++ // Qemu hardware is perfect and does not need any delays! +} + +static void init_idprom() +{ -+ char *va_prom; ++ void *va_prom; + + if ((va_prom = map_io(PHYS_JJ_EEPROM, PHYS_JJ_EEPROM_SIZE)) == NULL) { + printk("init_idprom: cannot map eeprom\n"); @@ -673,259 +860,97 @@ diff -ruN proll_18.orig/qemu/main.c proll-patch4/qemu/main.c + hw_idprom = va_prom; +} + +diff -ruN proll_18.orig/qemu/openprom.c proll-patch7/qemu/openprom.c +--- proll_18.orig/qemu/openprom.c 1970-01-01 00:00:00.000000000 +0000 ++++ proll-patch7/qemu/openprom.c 2005-03-02 20:09:57.000000000 +0000 +@@ -0,0 +1,646 @@ +/* -+ * Make CPU page tables. -+ * Returns pointer to context table. -+ * Here we ignore memory allocation errors which "should not happen" -+ * because we cannot print anything anyways if memory initialization fails. ++ * PROM interface support ++ * Copyright 1996 The Australian National University. ++ * Copyright 1996 Fujitsu Laboratories Limited ++ * Copyright 1999 Pete A. Zaitcev ++ * This software may be distributed under the terms of the Gnu ++ * Public License version 2 or later + */ -+void makepages_q(struct phym *t, unsigned int highbase) -+{ -+ unsigned int *ctp, *l1, pte; -+ int i; -+ unsigned int pa, va; + -+ ctp = mem_zalloc(&cmem, NCTX_SWIFT*sizeof(int), NCTX_SWIFT*sizeof(int)); -+ l1 = mem_zalloc(&cmem, 256*sizeof(int), 256*sizeof(int)); ++#include ++#include ++#include ++#include ++#include ++#include "phys_jj.h" + -+ pte = SRMMU_ET_PTD | (((unsigned int)l1 - PROLBASE + highbase) >> 4); -+ for (i = 0; i < NCTX_SWIFT; i++) { -+ ctp[i] = pte; -+ } ++//#define DEBUG_OBP + -+ pa = PROLBASE; -+ for (va = PROLBASE; va < PROLDATA; va += PAGE_SIZE) { -+ map_page(l1, va, pa, 0, highbase); -+ pa += PAGE_SIZE; -+ } -+ pa = highbase + PROLDATA - PROLBASE; -+ for (va = PROLDATA; va < PROLBASE + PROLSIZE; va += PAGE_SIZE) { -+ map_page(l1, va, pa, 0, highbase); -+ pa += PAGE_SIZE; -+ } ++struct property { ++ const char *name; ++ const char *value; ++ const int length; ++}; + -+ /* We need to start from LOADBASE, but kernel wants PAGE_SIZE. */ -+ pa = 0; -+ for (va = 0; va < LOWMEMSZ; va += PAGE_SIZE) { -+ map_page(l1, va, pa, 0, highbase); -+ pa += PAGE_SIZE; -+ } ++struct node { ++ const struct property *properties; ++ /* short */ const int sibling; ++ /* short */ const int child; ++}; + -+ t->pctp = ctp; -+ t->pl1 = l1; -+ t->pbas = highbase; -+} -diff -ruN proll_18.orig/qemu/Makefile proll-patch4/qemu/Makefile ---- proll_18.orig/qemu/Makefile 1970-01-01 00:00:00.000000000 +0000 -+++ proll-patch4/qemu/Makefile 2004-11-13 15:50:49.000000000 +0000 -@@ -0,0 +1,119 @@ -+# -+# proll: -+# qemu/Makefile - make PROLL for QEMU -+# $Id: proll.patch,v 1.2 2004-12-19 23:18:01 bellard Exp $ -+# -+# Copyright 1999 Pete Zaitcev -+# This is Free Software is licensed under terms of GNU General Public License. -+# ++static int obp_nextnode(int node); ++static int obp_child(int node); ++static int obp_proplen(int node, char *name); ++static int obp_getprop(int node, char *name, char *val); ++static int obp_setprop(int node, char *name, char *val, int len); ++static const char *obp_nextprop(int node, char *name); + -+CC = gcc ++static char obp_idprom[IDPROM_SIZE]; ++static const struct property null_properties = { NULL, NULL, -1 }; ++static const int prop_true = -1; + -+#CROSS = /usr/local/sparc/bin/sparc-sun-linux- -+CROSS = sparc-unknown-linux-gnu- ++static const struct property propv_root[] = { ++ {"name", "SUNW,JavaStation-1", sizeof("SUNW,JavaStation-1") }, ++ {"idprom", obp_idprom, IDPROM_SIZE}, ++ {"banner-name", "JavaStation", sizeof("JavaStation")}, ++ {"compatible", "sun4m", 6}, ++ {NULL, NULL, -1} ++}; + -+CROSSCC = $(CROSS)gcc -+CROSSLD = $(CROSS)ld -+CROSSNM = $(CROSS)nm ++static const int prop_iommu_reg[] = { ++ 0x0, 0x10000000, 0x00000300, ++}; ++static const struct property propv_iommu[] = { ++ {"name", "iommu", sizeof("iommu")}, ++ {"reg", (char*)&prop_iommu_reg[0], sizeof(prop_iommu_reg) }, ++ {NULL, NULL, -1} ++}; + -+RM = /bin/rm -f -+ELFTOAOUT = elftoaout ++static const int prop_sbus_ranges[] = { ++ 0x0, 0x0, 0x0, 0x30000000, 0x10000000, ++ 0x1, 0x0, 0x0, 0x40000000, 0x10000000, ++ 0x2, 0x0, 0x0, 0x50000000, 0x10000000, ++ 0x3, 0x0, 0x0, 0x60000000, 0x10000000, ++ 0x4, 0x0, 0x0, 0x70000000, 0x10000000, ++}; ++static const struct property propv_sbus[] = { ++ {"name", "sbus", 5}, ++ {"ranges", (char*)&prop_sbus_ranges[0], sizeof(prop_sbus_ranges)}, ++ {"device_type", "hierarchical", sizeof("hierarchical") }, ++ {NULL, NULL, -1} ++}; + -+# -+SRC = ../src -+ -+# Due to remapping algorithm PROLBASE should be algned on PMD. -+# We make PROLBASE a define instead of using _start because we -+# want to shift it to form a PGD entry. A relocatable label will not work. -+# Linux kernel expects us to be at LINUX_OPPROM_BEGVM . -+PROLBASE = 0xffd00000 -+PROLRODATA = 0xffd07000 -+PROLDATA = 0xffd09000 -+PROLSIZE = (240*1024) -+ -+# Linux -+# Fixed %g6 is for arch/sparc/kernel/head.S, it seems ok w/o -ffixed-g6. -+# Kernel uses -fcall-used-g5 -fcall-used-g7, we probably do not need them. -+# __ANSI__ is supposed to be on by default but it is not. -+CFLAGS = -O2 -Wall -DPROLBASE=$(PROLBASE) -DPROLDATA=$(PROLDATA) -DPROLRODATA=$(PROLRODATA) -D__ANSI__=1 -I$(SRC) -mcpu=hypersparc -g -+ASFLAGS = -D__ASSEMBLY__ -I$(SRC) -DPROLRODATA=$(PROLRODATA) -DPROLDATA=$(PROLDATA) -DPROLSIZE=$(PROLSIZE) -g -+# Solaris or Linux/i386 cross compilation -+#CFLAGS = -Iinclude -O -+ -+LDFLAGS = -N -Ttext $(PROLBASE) --section-start .rodata=$(PROLRODATA) -Tdata $(PROLDATA) -Tbss $(PROLDATA) -+ -+ALL = proll.aout -+PROLLEXE = proll.elf -+ -+OBJS = head.o wuf.o wof.o main.o vconsole.o hconsole.o rconsole.o \ -+ printf.o le.o system.o iommu.o \ -+ arp.o netinit.o bootp.o packet.o tftp.o udp.o sched_4m.o openprom.o -+ -+all: $(ALL) -+ -+$(PROLLEXE): $(OBJS) -+ $(CROSSLD) $(LDFLAGS) -o $(PROLLEXE) $(OBJS) -+ -+head.o: head.S $(SRC)/phys_jj.h \ -+ $(SRC)/asi.h $(SRC)/psr.h $(SRC)/crs.h -+ $(CROSSCC) $(ASFLAGS) -DPROLBASE=$(PROLBASE) -o $*.o -c $*.S -+ -+main.o: main.c $(SRC)/asi.h $(SRC)/pgtsrmmu.h $(SRC)/iommu.h \ -+ $(SRC)/phys_jj.h $(SRC)/vconsole.h $(SRC)/version.h $(SRC)/general.h \ -+ $(SRC)/net.h $(SRC)/romlib.h $(SRC)/netpriv.h $(SRC)/arpa.h $(SRC)/system.h -+ $(CROSSCC) $(CFLAGS) -c $*.c -+openprom.o: openprom.c $(SRC)/openprom.h $(SRC)/general.h $(SRC)/romlib.h \ -+ $(SRC)/vconsole.h $(SRC)/system.h $(SRC)/phys_jj.h -+ $(CROSSCC) $(CFLAGS) -c $*.c -+ -+system.o: $(SRC)/system.c $(SRC)/vconsole.h $(SRC)/pgtsrmmu.h \ -+ $(SRC)/timer.h $(SRC)/general.h $(SRC)/net.h $(SRC)/romlib.h $(SRC)/asi.h \ -+ $(SRC)/netpriv.h $(SRC)/arpa.h $(SRC)/system.h $(SRC)/crs.h -+ $(CROSSCC) $(CFLAGS) -c $(SRC)/$*.c -+iommu.o: $(SRC)/iommu.c $(SRC)/pgtsrmmu.h $(SRC)/phys_jj.h $(SRC)/iommu.h \ -+ $(SRC)/vconsole.h $(SRC)/general.h $(SRC)/romlib.h $(SRC)/system.h $(SRC)/asi.h -+ $(CROSSCC) $(CFLAGS) -c $(SRC)/$*.c -+vconsole.o: $(SRC)/vconsole.c $(SRC)/vconsole.h $(SRC)/hconsole.h -+ $(CROSSCC) $(CFLAGS) -c $(SRC)/$*.c -+hconsole.o: $(SRC)/hconsole.c $(SRC)/hconsole.h $(SRC)/rconsole.h $(SRC)/phys_jj.h -+ $(CROSSCC) $(CFLAGS) -c $(SRC)/$*.c -+rconsole.o: $(SRC)/rconsole.c $(SRC)/rconsole.h -+ $(CROSSCC) $(CFLAGS) -c $(SRC)/$*.c -+printf.o: $(SRC)/printf.c -+ $(CROSSCC) $(CFLAGS) -c $(SRC)/$*.c -+le.o: $(SRC)/le.c $(SRC)/dma.h $(SRC)/system.h $(SRC)/netpriv.h $(SRC)/romlib.h $(SRC)/general.h $(SRC)/net.h $(SRC)/phys_jj.h -+ $(CROSSCC) $(CFLAGS) -c $(SRC)/$*.c -+ -+arp.o: $(SRC)/arp.c $(SRC)/general.h $(SRC)/net.h $(SRC)/romlib.h $(SRC)/netpriv.h $(SRC)/arp.h -+ $(CROSSCC) $(CFLAGS) -c $(SRC)/$*.c -+netinit.o: $(SRC)/netinit.c $(SRC)/general.h $(SRC)/net.h $(SRC)/romlib.h $(SRC)/netpriv.h $(SRC)/arp.h $(SRC)/ip.h $(SRC)/udp.h -+ $(CROSSCC) $(CFLAGS) -c $(SRC)/$*.c -+tftp.o: $(SRC)/tftp.c $(SRC)/general.h $(SRC)/net.h $(SRC)/arpa.h $(SRC)/romlib.h $(SRC)/tftp.h -+ $(CROSSCC) $(CFLAGS) -c $(SRC)/$*.c -+udp.o: $(SRC)/udp.c $(SRC)/general.h $(SRC)/net.h $(SRC)/romlib.h $(SRC)/netpriv.h $(SRC)/arp.h $(SRC)/ip.h $(SRC)/udp.h -+ $(CROSSCC) $(CFLAGS) -c $(SRC)/$*.c -+packet.o: $(SRC)/packet.c $(SRC)/general.h $(SRC)/net.h $(SRC)/romlib.h $(SRC)/netpriv.h -+ $(CROSSCC) $(CFLAGS) -c $(SRC)/$*.c -+sched_4m.o: $(SRC)/sched_4m.c $(SRC)/system.h $(SRC)/general.h $(SRC)/romlib.h $(SRC)/phys_jj.h -+ $(CROSSCC) $(CFLAGS) -c $(SRC)/$*.c -+bootp.o: $(SRC)/bootp.c $(SRC)/general.h $(SRC)/net.h \ -+ $(SRC)/arpa.h $(SRC)/romlib.h $(SRC)/system.h $(SRC)/bootp.h -+ $(CROSSCC) $(CFLAGS) -DNOBPEXT=1 -c $(SRC)/$*.c -+ -+wuf.o: $(SRC)/wuf.S -+ $(CROSSCC) $(ASFLAGS) -o $*.o -c $(SRC)/$*.S -+wof.o: $(SRC)/wof.S -+ $(CROSSCC) $(ASFLAGS) -o $*.o -c $(SRC)/$*.S -+ -+#genlab.o: genlab.c -+# $(CC) -c $*.c -+# -+#genlab: genlab.o -+# $(CC) -o genlab genlab.o -+ -+clean: -+ $(RM) $(OBJS) -+ $(RM) $(PROLLEXE) proll.aout -+ -+proll.aout: $(PROLLEXE) -+ $(ELFTOAOUT) -o proll.aout $(PROLLEXE) -diff -ruN proll_18.orig/qemu/openprom.c proll-patch4/qemu/openprom.c ---- proll_18.orig/qemu/openprom.c 1970-01-01 00:00:00.000000000 +0000 -+++ proll-patch4/qemu/openprom.c 2004-11-23 19:14:05.000000000 +0000 -@@ -0,0 +1,596 @@ -+/* -+ * PROM interface support -+ * Copyright 1996 The Australian National University. -+ * Copyright 1996 Fujitsu Laboratories Limited -+ * Copyright 1999 Pete A. Zaitcev -+ * This software may be distributed under the terms of the Gnu -+ * Public License version 2 or later -+ */ -+ -+#include -+#include -+#include -+#include -+#include -+#include "phys_jj.h" -+ -+struct property { -+ const char *name; -+ const char *value; -+ const int length; -+}; -+ -+struct node { -+ const struct property *properties; -+ /* short */ const int sibling; -+ /* short */ const int child; -+}; -+ -+static int obp_nextnode(int node); -+static int obp_child(int node); -+static int obp_proplen(int node, char *name); -+static int obp_getprop(int node, char *name, char *val); -+static int obp_setprop(int node, char *name, char *val, int len); -+static const char *obp_nextprop(int node, char *name); -+ -+static char obp_idprom[IDPROM_SIZE]; -+static const struct property null_properties = { NULL, NULL, -1 }; -+static const int prop_true = -1; -+ -+static const struct property propv_root[] = { -+ {"name", "SUNW,JavaStation-1", sizeof("SUNW,JavaStation-1") }, -+ {"idprom", obp_idprom, IDPROM_SIZE}, -+ {"banner-name", "JavaStation", sizeof("JavaStation")}, -+ {"compatible", "sun4m", 6}, -+ {NULL, NULL, -1} -+}; -+ -+static const int prop_iommu_reg[] = { -+ 0x0, 0x10000000, 0x00000300, -+}; -+static const struct property propv_iommu[] = { -+ {"name", "iommu", sizeof("iommu")}, -+ {"reg", (char*)&prop_iommu_reg[0], sizeof(prop_iommu_reg) }, -+ {NULL, NULL, -1} -+}; -+ -+static const int prop_sbus_ranges[] = { -+ 0x0, 0x0, 0x0, 0x30000000, 0x10000000, -+ 0x1, 0x0, 0x0, 0x40000000, 0x10000000, -+ 0x2, 0x0, 0x0, 0x50000000, 0x10000000, -+ 0x3, 0x0, 0x0, 0x60000000, 0x10000000, -+ 0x4, 0x0, 0x0, 0x70000000, 0x10000000, -+}; -+static const struct property propv_sbus[] = { -+ {"name", "sbus", 5}, -+ {"ranges", (char*)&prop_sbus_ranges[0], sizeof(prop_sbus_ranges)}, -+ {NULL, NULL, -1} -+}; -+ -+static const int prop_tcx_regs[] = { -+ 0x2, 0x00800000, 0x00100000, -+ 0x2, 0x02000000, 0x00000001, -+ 0x2, 0x04000000, 0x00800000, -+ 0x2, 0x06000000, 0x00800000, -+ 0x2, 0x0a000000, 0x00000001, -+ 0x2, 0x0c000000, 0x00000001, -+ 0x2, 0x0e000000, 0x00000001, -+ 0x2, 0x00700000, 0x00001000, -+ 0x2, 0x00200000, 0x00000004, -+ 0x2, 0x00300000, 0x0000081c, -+ 0x2, 0x00000000, 0x00010000, -+ 0x2, 0x00240000, 0x00000004, -+ 0x2, 0x00280000, 0x00000001, -+}; ++static const int prop_tcx_regs[] = { ++ 0x2, 0x00800000, 0x00100000, ++ 0x2, 0x02000000, 0x00000001, ++ 0x2, 0x04000000, 0x00800000, ++ 0x2, 0x06000000, 0x00800000, ++ 0x2, 0x0a000000, 0x00000001, ++ 0x2, 0x0c000000, 0x00000001, ++ 0x2, 0x0e000000, 0x00000001, ++ 0x2, 0x00700000, 0x00001000, ++ 0x2, 0x00200000, 0x00000004, ++ 0x2, 0x00300000, 0x0000081c, ++ 0x2, 0x00000000, 0x00010000, ++ 0x2, 0x00240000, 0x00000004, ++ 0x2, 0x00280000, 0x00000001, ++}; + +#if 1 /* Zaitcev */ +static const int pixfreq = 0x03dfd240; @@ -1005,6 +1030,7 @@ diff -ruN proll_18.orig/qemu/openprom.c proll-patch4/qemu/openprom.c +static const struct property propv_obio[] = { + {"name", "obio", 5 }, + {"ranges", (char*)&prop_obio_ranges[0], sizeof(prop_obio_ranges) }, ++ {"device_type", "hierarchical", sizeof("hierarchical") }, + {NULL, NULL, -1} +}; + @@ -1056,29 +1082,35 @@ diff -ruN proll_18.orig/qemu/openprom.c proll-patch4/qemu/openprom.c + {NULL, NULL, -1} +}; + -+static const int prop_zs_intr[] = { 0x26, 0x0 }; ++static const int prop_zs_intr[] = { 12, 0x0 }; +static const int prop_zs_reg[] = { -+ 0x4, 0x00000000, 0x0000000f, ++ 0x0, 0x00000000, 0x00000008, +}; -+static const int prop_zs_slave[] = { 0x1 }; ++static const int prop_zs_addr = { 0x70000000 }; ++static const int prop_zs_slave[] = { 1 }; +static const struct property propv_obio_zs[] = { + {"name", "zs", sizeof("zs")}, + {"reg", (char*)&prop_zs_reg[0], sizeof(prop_zs_reg) }, -+ {"reg", (char*)&prop_zs_slave[0], sizeof(prop_zs_slave) }, ++ {"slave", (char*)&prop_zs_slave[0], sizeof(prop_zs_slave) }, + {"device_type", "serial", sizeof("serial") }, ++ {"intr", (char*)&prop_zs_intr[0], sizeof(prop_zs_intr) }, ++ // {"address", (char*)&prop_zs_addr, sizeof(prop_zs_addr) }, + {NULL, NULL, -1} +}; + -+static const int prop_zs1_intr[] = { 0x26, 0x0 }; ++static const int prop_zs1_intr[] = { 12, 0x0 }; +static const int prop_zs1_reg[] = { -+ 0x4, 0x00100000, 0x0000000f, ++ 0x0, 0x00100000, 0x00000008, +}; -+static const int prop_zs1_slave[] = { 0x0 }; ++static const int prop_zs1_addr = { 0x70100000 }; ++static const int prop_zs1_slave[] = { 0 }; +static const struct property propv_obio_zs1[] = { + {"name", "zs", sizeof("zs")}, + {"reg", (char*)&prop_zs1_reg[0], sizeof(prop_zs1_reg) }, -+ {"reg", (char*)&prop_zs1_slave[0], sizeof(prop_zs1_slave) }, ++ {"slave", (char*)&prop_zs1_slave[0], sizeof(prop_zs1_slave) }, + {"device_type", "serial", sizeof("serial") }, ++ {"intr", (char*)&prop_zs1_intr[0], sizeof(prop_zs1_intr) }, ++ // {"address", (char*)&prop_zs1_addr, sizeof(prop_zs1_addr) }, + {NULL, NULL, -1} +}; + @@ -1106,24 +1138,110 @@ diff -ruN proll_18.orig/qemu/openprom.c proll-patch4/qemu/openprom.c + {NULL, NULL, -1} +}; + ++static const int prop_espdma_reg[] = { ++ 0x4, 0x08400000, 0x00000010, ++}; ++// Disabled, not implemented yet ++static const struct property propv_sbus_espdma[] = { ++ {"name", "xxxespdma", sizeof("xxxespdma")}, ++ {"reg", (char*)&prop_espdma_reg[0], sizeof(prop_espdma_reg) }, ++ {NULL, NULL, -1} ++}; ++ ++static const int prop_esp_reg[] = { ++ 0x4, 0x08800000, 0x00000040, ++}; ++static const int prop_esp_intr[] = { 0x24, 0x0 }; ++static const struct property propv_sbus_espdma_esp[] = { ++ {"name", "esp", sizeof("esp")}, ++ {"reg", (char*)&prop_esp_reg[0], sizeof(prop_esp_reg) }, ++ {"intr", (char*)&prop_esp_intr[0], sizeof(prop_esp_intr) }, ++ {NULL, NULL, -1} ++}; ++ ++static const int prop_bpp_reg[] = { ++ 0x4, 0x0c800000, 0x0000001c, ++}; ++static const int prop_bpp_intr[] = { 0x33, 0x0 }; ++static const struct property propv_sbus_bpp[] = { ++ {"name", "SUNW,bpp", sizeof("SUNW,bpp")}, ++ {"reg", (char*)&prop_bpp_reg[0], sizeof(prop_bpp_reg) }, ++ {"intr", (char*)&prop_bpp_intr[0], sizeof(prop_bpp_intr) }, ++ {NULL, NULL, -1} ++}; ++ ++static const int prop_fd_intr[] = { 0x2b, 0x0 }; ++static const int prop_fd_reg[] = { ++ 0x0, 0x00400000, 0x0000000f, ++}; ++static const struct property propv_obio_fd[] = { ++ {"name", "SUNW,fdtwo", sizeof("SUNW,fdtwo")}, ++ {"reg", (char*)&prop_fd_reg[0], sizeof(prop_fd_reg) }, ++ {"device_type", "block", sizeof("block") }, ++ {"intr", (char*)&prop_fd_intr[0], sizeof(prop_fd_intr) }, ++ {NULL, NULL, -1} ++}; ++ ++static const int prop_pw_intr[] = { 0x22, 0x0 }; ++static const int prop_pw_reg[] = { ++ 0x0, 0x00910000, 0x00000001, ++}; ++static const struct property propv_obio_pw[] = { ++ {"name", "power", sizeof("power")}, ++ {"reg", (char*)&prop_pw_reg[0], sizeof(prop_pw_reg) }, ++ {"intr", (char*)&prop_pw_intr[0], sizeof(prop_pw_intr) }, ++ {NULL, NULL, -1} ++}; ++ ++static const int prop_cf_reg[] = { ++ 0x0, 0x00800000, 0x00000001, ++}; ++static const struct property propv_obio_cf[] = { ++ {"name", "slavioconfig", sizeof("slavioconfig")}, ++ {"reg", (char*)&prop_cf_reg[0], sizeof(prop_cf_reg) }, ++ {NULL, NULL, -1} ++}; ++ +static const struct node nodes[] = { + { &null_properties, 1, 0 }, /* 0 = big brother of root */ + { propv_root, 0, 2 }, /* 1 "/" */ -+ { propv_iommu, 8, 3 }, /* 2 "/iommu" */ ++ { propv_iommu, 11, 3 }, /* 2 "/iommu" */ + { propv_sbus, 0, 4 }, /* 3 "/iommu/sbus" */ + { propv_sbus_tcx, 5, 0 }, /* 4 "/iommu/sbus/SUNW,tcx" */ + { propv_sbus_ledma, 7, 6 }, /* 5 "/iommu/sbus/ledma" */ + { propv_sbus_ledma_le, 0, 0 }, /* 6 "/iommu/sbus/ledma/le" */ -+ { propv_sbus_cs4231, 0, 0 }, /* 7 "/iommu/sbus/SUNW,CS4231 */ -+ { propv_cpu, 9, 0 }, /* 8 "/STP1012PGA" */ -+ { propv_obio, 0, 10 }, /* 9 "/obio" */ -+ { propv_obio_int, 11, 0 }, /* 10 "/obio/interrupt" */ -+ { propv_obio_cnt, 12, 0 }, /* 11 "/obio/counter" */ -+ { propv_obio_eep, 13, 0 }, /* 12 "/obio/eeprom" */ ++ { propv_sbus_cs4231, 8, 0 }, /* 7 "/iommu/sbus/SUNW,CS4231 */ ++ { propv_sbus_bpp, 9, 0 }, /* 8 "/iommu/sbus/SUNW,bpp */ ++ { propv_sbus_espdma, 0, 10 }, /* 9 "/iommu/sbus/espdma" */ ++ { propv_sbus_espdma_esp, 0, 0 }, /* 10 "/iommu/sbus/espdma/esp" */ ++ { propv_cpu, 12, 0 }, /* 11 "/STP1012PGA" */ ++ { propv_obio, 0, 13 }, /* 12 "/obio" */ ++ { propv_obio_int, 14, 0 }, /* 13 "/obio/interrupt" */ ++ { propv_obio_cnt, 15, 0 }, /* 14 "/obio/counter" */ ++ { propv_obio_eep, 16, 0 }, /* 15 "/obio/eeprom" */ ++ { propv_obio_auxio, 17, 0 }, /* 16 "/obio/auxio" */ ++ { propv_obio_zs, 18, 0 }, /* 17 "/obio/zs@0,0" */ ++ { propv_obio_zs1, 19, 0 }, /* 18 "/obio/zs@0,100000" */ ++ { propv_obio_fd, 20, 0 }, /* 19 "/obio/SUNW,fdtwo" */ ++ { propv_obio_pw, 21, 0 }, /* 20 "/obio/power" */ ++ { propv_obio_cf, 0, 0 }, /* 21 "/obio/slavioconfig@0,800000" */ ++#if 0 + { propv_obio_su, 14, 0 }, /* 13 "/obio/su" */ -+ { propv_obio_auxio, 0, 0 }, /* 14 "/obio/auxio" */ -+ { propv_obio_zs, 0, 0 }, /* 14 "/obio/zs@0,0" */ -+ { propv_obio_zs1, 0, 0 }, /* 14 "/obio/zs@0,100000" */ ++ { propv_cpu, 18, 0 }, /* 17 "/STP1012PGA" */ ++ { propv_cpu, 19, 0 }, /* 18 "/STP1012PGA" */ ++ ++ { propv_cpu, 20, 0 }, /* 19 "/STP1012PGA" */ ++ { propv_cpu, 21, 0 }, /* 20 "/STP1012PGA" */ ++ { propv_cpu, 22, 0 }, /* 21 "/STP1012PGA" */ ++ { propv_cpu, 23, 0 }, /* 22 "/STP1012PGA" */ ++ { propv_cpu, 24, 0 }, /* 23 "/STP1012PGA" */ ++ { propv_cpu, 25, 0 }, /* 24 "/STP1012PGA" */ ++ { propv_cpu, 26, 0 }, /* 25 "/STP1012PGA" */ ++ { propv_cpu, 27, 0 }, /* 26 "/STP1012PGA" */ ++ { propv_cpu, 28, 0 }, /* 27 "/STP1012PGA" */ ++ { propv_cpu, 29, 0 }, /* 28 "/STP1012PGA" */ ++ { propv_cpu, 30, 0 }, /* 29 "/STP1012PGA" */ ++#endif +}; + +static struct linux_mlist_v0 totphys[MAX_BANKS]; @@ -1144,303 +1262,677 @@ diff -ruN proll_18.orig/qemu/openprom.c proll-patch4/qemu/openprom.c + obp_nextprop /* char * (*no_nextprop)(int node, char *name); */ +}; + -+static const char arg_nfsroot[] = "console=ttyS0 ip=bootp root=nfs"; -+ -+static const struct linux_arguments_v0 obp_arg = { -+ { "le()", arg_nfsroot, NULL, NULL, NULL, NULL, NULL, NULL }, -+ { "" }, -+ { 'l', 'e' }, 0, 0, 0, NULL, -+ NULL -+}; ++static struct linux_arguments_v0 obp_arg; +static const struct linux_arguments_v0 * const obp_argp = &obp_arg; + -+static const void * const synch_hook = NULL; -+#if 0 -+static const char obp_stdin = PROMDEV_KBD; -+static const char obp_stdout = PROMDEV_SCREEN; -+#else -+static const char obp_stdin = PROMDEV_TTYA; -+static const char obp_stdout = PROMDEV_TTYA; -+#endif ++static void (*synch_hook)(void); ++static char obp_stdin, obp_stdout; ++ ++static int obp_nbgetchar(void); ++static int obp_nbputchar(int ch); ++static void obp_reboot(char *); ++static void obp_abort(void); ++static void obp_halt(void); ++static int obp_devopen(char *str); ++static int obp_devclose(int dev_desc); ++static int obp_rdblkdev(int dev_desc, int num_blks, int blk_st, char *buf); ++ ++static void doublewalk(unsigned ptab1, unsigned va) ++{ ++unsigned int proc_tablewalk(int ctx, unsigned int va); ++unsigned int mem_tablewalk(unsigned int pa, unsigned int va); ++ ++ proc_tablewalk(0, va); ++ if (ptab1 != 0) mem_tablewalk(ptab1, va); ++} ++ ++static struct linux_romvec romvec0; ++ ++void * ++init_openprom_qemu(int bankc, struct bank *bankv, unsigned hiphybas, ++ const char *cmdline, char boot_device, int nographic) ++{ ++ int i; ++ ++ /* ++ * Avoid data segment allocations ++ */ ++ ptphys = totphys; ++ ptmap = totmap; ++ ptavail = totavail; ++ /* ++ * Form memory descriptors. ++ */ ++ for (i = 0; i < bankc; i++) { ++ totphys[i].theres_more = &totphys[i+1]; ++ totphys[i].start_adr = (char*) bankv[i].start; ++ totphys[i].num_bytes = bankv[i].length; ++ } ++ totphys[i-1].theres_more = 0; ++ ++ /* ++ * XXX Merged in normal PROM when full banks touch. ++ */ ++ for (i = 0; i < bankc; i++) { ++ unsigned bankbase = bankv[i].start; ++ unsigned banksize = bankv[i].length; ++ if (hiphybas > bankbase && ++ hiphybas < bankbase + banksize) { ++ banksize = hiphybas - bankbase; ++ } ++ totavail[i].theres_more = &totavail[i+1]; ++ totavail[i].start_adr = (char*) bankbase; ++ totavail[i].num_bytes = banksize; ++ } ++ totavail[i-1].theres_more = 0; ++ ++ totmap[0].theres_more = 0; ++ totmap[0].start_adr = (char*) PROLBASE; ++ totmap[0].num_bytes = PROLSIZE; ++ ++ /* ++ * idprom ++ */ ++ bcopy(idprom, obp_idprom, IDPROM_SIZE); ++ ++ // Linux wants a R/W romvec table ++ romvec0.pv_magic_cookie = LINUX_OPPROM_MAGIC; ++ romvec0.pv_plugin_revision = 77; ++ romvec0.pv_printrev = 0x10203; ++ romvec0.pv_v0mem.v0_totphys = &ptphys; ++ romvec0.pv_v0mem.v0_prommap = &ptmap; ++ romvec0.pv_v0mem.v0_available = &ptavail; ++ romvec0.pv_nodeops = &nodeops0; ++ romvec0.pv_bootstr = (void *)doublewalk; ++ romvec0.pv_v0devops.v0_devopen = &obp_devopen; ++ romvec0.pv_v0devops.v0_devclose = &obp_devclose; ++ romvec0.pv_v0devops.v0_rdblkdev = &obp_rdblkdev; ++ romvec0.pv_stdin = &obp_stdin; ++ romvec0.pv_stdout = &obp_stdout; ++ romvec0.pv_getchar = obp_nbgetchar; ++ romvec0.pv_putchar = (void (*)(int))obp_nbputchar; ++ romvec0.pv_nbgetchar = obp_nbgetchar; ++ romvec0.pv_nbputchar = obp_nbputchar; ++ romvec0.pv_reboot = obp_reboot; ++ romvec0.pv_abort = obp_abort; ++ romvec0.pv_halt = obp_halt; ++ romvec0.pv_synchook = &synch_hook; ++ romvec0.pv_v0bootargs = &obp_argp; ++ switch(boot_device) { ++ default: ++ case 'a': ++ obp_arg.argv[0] = "fd()"; ++ break; ++ case 'c': ++ obp_arg.argv[0] = "sd()"; ++ break; ++ case 'n': ++ obp_arg.argv[0] = "le()"; ++ break; ++ } ++ obp_arg.argv[1] = cmdline; ++ ++ if (nographic) { ++ obp_stdin = PROMDEV_TTYA; ++ obp_stdout = PROMDEV_TTYA; ++ } else { ++ obp_stdin = PROMDEV_KBD; ++ obp_stdout = PROMDEV_SCREEN; ++ } ++ return &romvec0; ++} ++ ++static const struct property *find_property(int node,char *name) ++{ ++ const struct property *prop = &nodes[node].properties[0]; ++ while (prop && prop->name) { ++ if (bcmp(prop->name, name, 128) == 0) return prop; ++ prop++; ++ } ++ return NULL; ++} ++ ++static int obp_nextnode(int node) ++{ ++#ifdef DEBUG_OBP ++ printk("obp_nextnode(%d) = %d\n", node, nodes[node].sibling); ++#endif ++ return nodes[node].sibling; ++} ++ ++static int obp_child(int node) ++{ ++#ifdef DEBUG_OBP ++ printk("obp_child(%d) = %d\n", node, nodes[node].child); ++#endif ++ return nodes[node].child; ++} ++ ++static int obp_proplen(int node, char *name) ++{ ++ const struct property *prop = find_property(node,name); ++ if (prop) { ++#ifdef DEBUG_OBP ++ printk("obp_proplen(%d, %s) = %d\n", node, name, prop->length); ++#endif ++ return prop->length; ++ } ++#ifdef DEBUG_OBP ++ printk("obp_proplen(%d, %s) (no prop)\n", node, name); ++#endif ++ return -1; ++} ++ ++static int obp_getprop(int node, char *name, char *value) ++{ ++ const struct property *prop; ++ ++ prop = find_property(node,name); ++ if (prop) { ++ memcpy(value,prop->value,prop->length); ++#ifdef DEBUG_OBP ++ printk("obp_getprop(%d, %s) = %s\n", node, name, value); ++#endif ++ return prop->length; ++ } ++#ifdef DEBUG_OBP ++ printk("obp_getprop(%d, %s): not found\n", node, name); ++#endif ++ return -1; ++} ++ ++static int obp_setprop(int node, char *name, char *value, int len) ++{ ++#ifdef DEBUG_OBP ++ printk("obp_setprop(%d, %s) = %s (%d)\n", node, name, value, len); ++#endif ++ return -1; ++} ++ ++static const char *obp_nextprop(int node,char *name) ++{ ++ const struct property *prop = find_property(node,name); ++ if (prop) { ++#ifdef DEBUG_OBP ++ printk("obp_nextprop(%d, %s) = %s\n", node, name, prop[1].name); ++#endif ++ return prop[1].name; ++ } ++#ifdef DEBUG_OBP ++ printk("obp_nextprop(%d, %s): not found\n", node, name); ++#endif ++ return NULL; ++} ++ ++static int obp_nbgetchar(void) { ++ extern struct vconterm dp0; ++ return vcon_getch(&dp0); ++} ++ ++static int obp_nbputchar(int ch) { ++ printk("%c", ch); ++ return 0; ++} ++ ++static void obp_reboot(char *str) { ++ printk("rebooting (%s): not implemented, freezing\n", str); ++ for (;;) {} ++} ++ ++static void obp_abort() { ++ printk("abort, freezing\n"); ++ for (;;) {} ++} ++ ++static void obp_halt() { ++ printk("halt, freezing\n"); ++ for (;;) {} ++} ++ ++static int obp_devopen(char *str) { ++#ifdef DEBUG_OBP ++ printk("open %s\n", str); ++#endif ++ return 0; ++} ++ ++static int obp_devclose(int dev_desc) { ++#ifdef DEBUG_OBP ++ printk("close %d\n", dev_desc); ++#endif ++ return 0; ++} ++ ++static int obp_rdblkdev(int dev_desc, int num_blks, int blk_st, char *buf) { ++#ifdef DEBUG_OBP ++ printk("rdblkdev: fd %d, num_blks %d, blk_st %d, buf 0x%x\n", dev_desc, num_blks, blk_st, buf); ++#endif ++ //buf[8] = 'L'; ++ return num_blks; ++} +diff -ruN proll_18.orig/qemu/system_qemu.c proll-patch7/qemu/system_qemu.c +--- proll_18.orig/qemu/system_qemu.c 1970-01-01 00:00:00.000000000 +0000 ++++ proll-patch7/qemu/system_qemu.c 2005-03-02 16:10:20.000000000 +0000 +@@ -0,0 +1,416 @@ ++/** ++ ** Proll (PROM replacement) ++ ** system.c: shared miscallenea. ++ ** Copyright 1999 Pete Zaitcev ++ ** This code is licensed under GNU General Public License. ++ **/ ++#include ++#include ++#include ++#ifndef NULL ++#define NULL ((void*)0) ++#endif ++ ++#include "pgtsrmmu.h" ++ ++#include "vconsole.h" ++#include /* Local copy of 2.2 style include */ ++#include /* __P() */ ++#include /* init_net() */ ++#include /* we are a provider for part of this. */ ++#include /* myipaddr */ ++#include ++#include /* our own prototypes */ ++ ++/* ++ * We export this. ++ */ ++char idprom[IDPROM_SIZE]; ++ ++ ++/* ++ * Create an I/O mapping to pa[size]. ++ * Returns va of the mapping or 0 if unsuccessful. ++ */ ++void * ++map_io(unsigned pa, int size) ++{ ++ void *va; ++ unsigned int npages; ++ unsigned int off; ++ unsigned int mva; ++ ++ off = pa & (PAGE_SIZE-1); ++ npages = (off + size + (PAGE_SIZE-1)) / PAGE_SIZE; ++ pa &= ~(PAGE_SIZE-1); ++ ++ va = mem_alloc(&cio, npages*PAGE_SIZE, PAGE_SIZE); ++ if (va == 0) return va; ++ ++ mva = (unsigned int) va; ++ /* printk("map_io: va 0x%x pa 0x%x off 0x%x npages %d\n", va, pa, off, npages); */ /* P3 */ ++ while (npages-- != 0) { ++ map_page(pmem.pl1, mva, pa, 1, pmem.pbas); ++ mva += PAGE_SIZE; ++ pa += PAGE_SIZE; ++ } ++ ++ return (void *)((unsigned int)va + off); ++} ++ ++/* ++ * Tablewalk routine used for testing. ++ * Returns PTP/PTE. ++ */ ++unsigned int ++proc_tablewalk(int ctx, unsigned int va) ++{ ++ unsigned int pa1; ++ ++ __asm__ __volatile__ ("lda [%1] %2, %0" : ++ "=r" (pa1) : ++ "r" (AC_M_CTPR), "i" (ASI_M_MMUREGS)); ++ /* printk(" ctpr %x ctx %x\n", pa1, ctx); */ /* P3 */ ++ pa1 <<= 4; ++ pa1 = ld_bypass(pa1 + (ctx << 2)); ++ if ((pa1 & 0x03) == 0) goto invalid; ++ return mem_tablewalk((pa1 & 0xFFFFFFF0) << 4, va); ++ ++invalid: ++ printk(" invalid %x\n", pa1); ++ return 0; ++} ++ ++/* ++ * Walk the tables in memory, starting at physical address pa. ++ */ ++unsigned int ++mem_tablewalk(unsigned int pa, unsigned int va) ++{ ++ unsigned int pa1; ++ ++ printk("pa %x va %x", pa, va); ++ pa1 = ld_bypass(pa + (((va&0xFF000000)>>24) << 2)); ++ if ((pa1 & 0x03) == 0) goto invalid; ++ printk(" l1 %x", pa1); ++ pa1 <<= 4; pa1 &= 0xFFFFFF00; ++ pa1 = ld_bypass(pa1 + (((va&0x00FC0000)>>18) << 2)); ++ if ((pa1 & 0x03) == 0) goto invalid; ++ printk(" l2 %x", pa1); ++ pa1 <<= 4; pa1 &= 0xFFFFFF00; ++ pa1 = ld_bypass(pa1 + (((va&0x0003F000)>>12) << 2)); ++ if ((pa1 & 0x03) == 0) goto invalid; ++ printk(" l3 %x", pa1); ++ printk(" off %x\n", va&0x00000FFF); ++ return pa1; ++invalid: ++ printk(" invalid %x\n", pa1); ++ return 0; ++} ++ ++/* ++ * Make CPU page tables. ++ * Returns pointer to context table. ++ * Here we ignore memory allocation errors which "should not happen" ++ * because we cannot print anything anyways if memory initialization fails. ++ */ ++void makepages(struct phym *t, unsigned int highbase) ++{ ++ unsigned int *ctp, *l1, pte; ++ int i; ++ unsigned int pa, va; ++ ++ ctp = mem_zalloc(&cmem, NCTX_SWIFT*sizeof(int), NCTX_SWIFT*sizeof(int)); ++ l1 = mem_zalloc(&cmem, 256*sizeof(int), 256*sizeof(int)); ++ ++ pte = SRMMU_ET_PTD | (((unsigned int)l1 - PROLBASE + highbase) >> 4); ++ for (i = 0; i < NCTX_SWIFT; i++) { ++ ctp[i] = pte; ++ } ++ ++ pa = PROLBASE; ++ for (va = PROLBASE; va < PROLDATA; va += PAGE_SIZE) { ++ map_page(l1, va, pa, 0, highbase); ++ pa += PAGE_SIZE; ++ } ++ pa = highbase + PROLDATA - PROLBASE; ++ for (va = PROLDATA; va < PROLBASE + PROLSIZE; va += PAGE_SIZE) { ++ map_page(l1, va, pa, 0, highbase); ++ pa += PAGE_SIZE; ++ } ++ ++ /* We need to start from LOADBASE, but kernel wants PAGE_SIZE. */ ++ pa = 0; ++ for (va = 0; va < LOWMEMSZ; va += PAGE_SIZE) { ++ map_page(l1, va, pa, 0, highbase); ++ pa += PAGE_SIZE; ++ } + -+static int obp_nbgetchar(void); -+static int obp_nbputchar(int ch); -+static void obp_reboot(char *); -+static void obp_abort(void); -+static void obp_halt(void); -+static int obp_devopen(char *str); -+static int obp_devclose(int dev_desc); -+static int obp_rdblkdev(int dev_desc, int num_blks, int blk_st, char *buf); ++ t->pctp = ctp; ++ t->pl1 = l1; ++ t->pbas = highbase; ++} + -+static void doublewalk(unsigned ptab1, unsigned va) ++/* ++ * Create a memory mapping from va to epa in page table pgd. ++ * highbase is used for v2p translation. ++ */ ++int ++map_page(unsigned int *pgd, unsigned int va, ++ unsigned int epa, int type, unsigned int highbase) +{ -+unsigned int proc_tablewalk(int ctx, unsigned int va); -+unsigned int mem_tablewalk(unsigned int pa, unsigned int va); -+ -+ proc_tablewalk(0, va); -+ if (ptab1 != 0) mem_tablewalk(ptab1, va); -+} ++ unsigned int pte; ++ unsigned int *p; ++ unsigned int pa; ++ ++ pte = pgd[((va)>>SRMMU_PGDIR_SHIFT) & (SRMMU_PTRS_PER_PGD-1)]; ++ if ((pte & SRMMU_ET_MASK) == SRMMU_ET_INVALID) { ++ p = mem_zalloc(&cmem, SRMMU_PTRS_PER_PMD*sizeof(int), ++ SRMMU_PTRS_PER_PMD*sizeof(int)); ++ if (p == 0) goto drop; ++ pte = SRMMU_ET_PTD | ++ (((unsigned int)p - PROLBASE + highbase) >> 4); ++ pgd[((va)>>SRMMU_PGDIR_SHIFT) & (SRMMU_PTRS_PER_PGD-1)] = pte; ++ /* barrier() */ ++ } + -+#ifdef ORIG -+static const struct linux_romvec romvec0 = { -+ LINUX_OPPROM_MAGIC, /* pv_magic_cookie */ -+ 0, /* pv_romvers - Format selector! */ -+ 77, /* pv_plugin_revision */ -+ 0x10203, /* pv_printrev */ -+ { /* pv_v0mem */ -+ &ptphys, /* v0_totphys */ -+ &ptmap, /* v0_prommap */ -+ &ptavail /* v0_available */ -+ }, -+ &nodeops0, /* struct linux_nodeops *pv_nodeops; */ -+ (void*)doublewalk, /* P3 */ /* char **pv_bootstr; */ -+ { /* struct linux_dev_v0_funcs pv_v0devops; */ -+ &obp_devopen, /* v0_devopen */ -+ &obp_devclose, /* v0_devclose */ -+ &obp_rdblkdev, /* v0_rdblkdev */ -+ NULL, /* v0_wrblkdev */ -+ NULL, /* v0_wrnetdev */ -+ NULL, /* v0_rdnetdev */ -+ NULL, /* v0_rdchardev */ -+ NULL, /* v0_wrchardev */ -+ NULL /* v0_seekdev */ -+ }, -+ &obp_stdin, /* char *pv_stdin */ -+ &obp_stdout, /* char *pv_stdout; */ -+ obp_nbgetchar, /* int (*pv_getchar)(void); */ -+ obp_nbputchar, /* void (*pv_putchar)(int ch); */ -+ obp_nbgetchar, /* int (*pv_nbgetchar)(void); */ -+ obp_nbputchar, /* int (*pv_nbputchar)(int ch); */ -+ NULL, /* void (*pv_putstr)(char *str, int len); */ -+ obp_reboot, /* void (*pv_reboot)(char *bootstr); */ -+ NULL, /* void (*pv_printf)(__const__ char *fmt, ...); */ -+ obp_abort, /* void (*pv_abort)(void); */ -+ NULL, /* __volatile__ int *pv_ticks; */ -+ obp_halt, /* void (*pv_halt)(void); */ -+ (void *)&synch_hook, /* void (**pv_synchook)(void); */ ++ pa = ((pte & 0xFFFFFFF0) << 4); ++ pa += (((va)>>SRMMU_PMD_SHIFT & (SRMMU_PTRS_PER_PMD-1)) << 2); ++ pte = ld_bypass(pa); ++ if ((pte & SRMMU_ET_MASK) == SRMMU_ET_INVALID) { ++ p = mem_zalloc(&cmem, SRMMU_PTRS_PER_PTE*sizeof(int), ++ SRMMU_PTRS_PER_PTE*sizeof(int)); ++ if (p == 0) goto drop; ++ pte = SRMMU_ET_PTD | ++ (((unsigned int)p - PROLBASE + highbase) >> 4); ++ st_bypass(pa, pte); ++ } + -+#if 0 -+ /* Evaluate a forth string, not different proto for V0 and V2->up. */ -+ union { -+ void (*v0_eval)(int len, char *str); -+ void (*v2_eval)(char *str); -+ } pv_fortheval; -+#endif -+ { 0 }, /* pv_fortheval */ -+ -+ &obp_argp, /* struct linux_arguments_v0 **pv_v0bootargs; */ -+ NULL, /* pv_enaddr */ -+ { /* pv_v2bootargs */ -+ NULL, /* char **bootpath; */ -+ NULL, /* char **bootargs; */ -+ NULL, /* fd_stdin; */ -+ NULL, /* fd_stdout */ -+ }, -+ { /* pv_v2devops */ -+ NULL, /* v2_inst2pkg */ -+ NULL, /* v2_dumb_mem_alloc */ -+ NULL, /* v2_dumb_mem_free */ -+ NULL, /* v2_dumb_mmap */ -+ NULL, /* v2_dumb_munmap */ -+ NULL, /* v2_dev_open */ -+ NULL, /* v2_dev_close */ -+ NULL, /* v2_dev_read */ -+ NULL, /* v2_dev_write */ -+ NULL, /* v2_dev_seek */ -+ NULL, /* v2_wheee2 */ -+ NULL, /* v2_wheee3 */ -+ }, -+ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, /* filler[15] */ -+ NULL, /* pv_setctxt */ -+ NULL, /* v3_cpustart */ -+ NULL, /* v3_cpustop */ -+ NULL, /* v3_cpuidle */ -+ NULL /* v3_cpuresume */ -+}; -+#endif ++ pa = ((pte & 0xFFFFFFF0) << 4); ++ pa += (((va)>>PAGE_SHIFT & (SRMMU_PTRS_PER_PTE-1)) << 2); ++ ++ pte = SRMMU_ET_PTE | ((epa & PAGE_MASK) >> 4); ++ if (type) { /* I/O */ ++ pte |= SRMMU_REF; ++ /* SRMMU cannot make Supervisor-only, but not exectutable */ ++ pte |= SRMMU_PRIV; ++ } else { /* memory */ ++ pte |= SRMMU_REF|SRMMU_CACHE; ++ pte |= SRMMU_PRIV; /* Supervisor only access */ ++ } ++ st_bypass(pa, pte); ++ return 0; + -+static struct linux_romvec romvec0; ++drop: ++ return -1; ++} + -+void * -+init_openprom(int bankc, struct bank *bankv, unsigned hiphybas) ++/* ++ * Switch page tables. ++ */ ++void ++init_mmu_swift(unsigned int ctp_phy) +{ -+ int i; ++ unsigned int addr; + + /* -+ * Avoid data segment allocations -+ */ -+ ptphys = totphys; -+ ptmap = totmap; -+ ptavail = totavail; -+ /* -+ * Form memory descriptors. ++ * Flush cache + */ -+ for (i = 0; i < bankc; i++) { -+ totphys[i].theres_more = &totphys[i+1]; -+ totphys[i].start_adr = (char*) bankv[i].start; -+ totphys[i].num_bytes = bankv[i].length; ++ for (addr = 0; addr < 0x2000; addr += 0x10) { ++ __asm__ __volatile__ ("sta %%g0, [%0] %1\n\t" : : ++ "r" (addr), "i" (ASI_M_DATAC_TAG)); ++ __asm__ __volatile__ ("sta %%g0, [%0] %1\n\t" : : ++ "r" (addr<<1), "i" (ASI_M_TXTC_TAG)); + } -+ totphys[i-1].theres_more = 0; + + /* -+ * XXX Merged in normal PROM when full banks touch. ++ * Switch ctx table + */ -+ for (i = 0; i < bankc; i++) { -+ unsigned bankbase = bankv[i].start; -+ unsigned banksize = bankv[i].length; -+ if (hiphybas > bankbase && -+ hiphybas < bankbase + banksize) { -+ banksize = hiphybas - bankbase; -+ } -+ totavail[i].theres_more = &totavail[i+1]; -+ totavail[i].start_adr = (char*) bankbase; -+ totavail[i].num_bytes = banksize; -+ } -+ totavail[i-1].theres_more = 0; -+ -+ totmap[0].theres_more = 0; -+ totmap[0].start_adr = (char*) PROLBASE; -+ totmap[0].num_bytes = PROLSIZE; ++ ctp_phy >>= 4; ++ /* printk("done flushing, switching to %x\n", ctp_phy); */ ++ __asm__ __volatile__ ("sta %0, [%1] %2\n\t" : : ++ "r" (ctp_phy), "r" (AC_M_CTPR), "i" (ASI_M_MMUREGS)); + + /* -+ * idprom ++ * Flush old page table references + */ -+ bcopy(idprom, obp_idprom, IDPROM_SIZE); -+ -+ // Linux wants a R/W romvec table -+ romvec0.pv_magic_cookie = LINUX_OPPROM_MAGIC; -+ romvec0.pv_plugin_revision = 77; -+ romvec0.pv_printrev = 0x10203; -+ romvec0.pv_v0mem.v0_totphys = &ptphys; -+ romvec0.pv_v0mem.v0_prommap = &ptmap; -+ romvec0.pv_v0mem.v0_available = &ptavail; -+ romvec0.pv_nodeops = &nodeops0; -+ romvec0.pv_bootstr = (void *)doublewalk; -+ romvec0.pv_stdin = &obp_stdin; -+ romvec0.pv_stdout = &obp_stdout; -+ romvec0.pv_getchar = obp_nbgetchar; -+ romvec0.pv_putchar = obp_nbputchar; -+ romvec0.pv_nbgetchar = obp_nbgetchar; -+ romvec0.pv_nbputchar = obp_nbputchar; -+ romvec0.pv_reboot = obp_reboot; -+ romvec0.pv_abort = obp_abort; -+ romvec0.pv_halt = obp_halt; -+ romvec0.pv_synchook = &synch_hook; -+ romvec0.pv_v0bootargs = &obp_argp; -+ return &romvec0; ++ __asm__ __volatile__ ("sta %%g0, [%0] %1\n\t" : : ++ "r" (0x400), "i" (ASI_M_FLUSH_PROBE) : "memory"); +} + -+static const struct property *find_property(int node,char *name) -+{ -+ const struct property *prop = &nodes[node].properties[0]; -+ while (prop && prop->name) { -+ if (bcmp(prop->name, name, 128) == 0) return prop; -+ prop++; ++/* ++ * add_timer, del_timer ++ * This should go into sched.c, but we have it split for different archs. ++ */ ++struct timer_list_head { ++ struct timer_list *head, *tail; ++}; ++ ++static struct timer_list_head timers; /* Anonymous heap of timers */ ++ ++void add_timer(struct timer_list *timer) { ++ struct timer_list *p; ++ if (timer->prev != NULL || timer->next != NULL) { ++ printk("bug: kernel timer added twice at 0x%x.\n", ++ __builtin_return_address(0)); ++ return; + } -+ return NULL; ++ if ((p = timers.tail) != NULL) { ++ timer->prev = p; ++ p->next = timer; ++ timers.tail = timer; ++ } else { ++ timers.head = timer; ++ timers.tail = timer; ++ } ++ return; +} + -+static int obp_nextnode(int node) -+{ -+ return nodes[node].sibling; ++int del_timer(struct timer_list *timer) { ++ struct timer_list *p; ++ int ret; ++ ++ if (timers.head == timer) timers.head = timer->next; ++ if (timers.tail == timer) timers.tail = timer->prev; ++ if ((p = timer->prev) != NULL) p->next = timer->next; ++ if ((p = timer->next) != NULL) p->prev = timer->prev; ++ ret = timer->next != 0 || timer->prev != 0; ++ timer->next = NULL; ++ timer->prev = NULL; ++ return ret; +} + -+static int obp_child(int node) -+{ -+ return nodes[node].child; ++void run_timers() { ++ struct timer_list *p; ++ ++ p = timers.head; ++ while (p != NULL) { ++ if (p->expires < jiffies) { ++ del_timer(p); /* XXX make nonstatic member */ ++ (*p->function)(p->data); ++ p = timers.head; ++ } else { ++ p = p->next; ++ } ++ } +} + -+static int obp_proplen(int node, char *name) ++/* ++ * Allocate memory. This is reusable. ++ */ ++void mem_init(struct mem *t, char *begin, char *limit) +{ -+ const struct property *prop = find_property(node,name); -+ if (prop) return prop->length; -+ return -1; ++ t->start = begin; ++ t->uplim = limit; ++ t->curp = begin; +} + -+static int obp_getprop(int node, char *name, char *value) ++void mem_fini(struct mem *t) +{ -+ const struct property *prop; -+ -+ prop = find_property(node,name); -+ if (prop) { -+ memcpy(value,prop->value,prop->length); -+ //printk("obp_getprop '%s'= %s\n", name, value); -+ return prop->length; -+ } -+ //printk("obp_getprop: not found\n"); -+ return -1; ++ t->curp = 0; +} + -+static int obp_setprop(int node, char *name, char *value, int len) ++void *mem_alloc(struct mem *t, int size, int align) +{ -+ return -1; -+} ++ char *p; + -+static const char *obp_nextprop(int node,char *name) -+{ -+ const struct property *prop = find_property(node,name); -+ if (prop) return prop[1].name; -+ return NULL; ++ p = (char *)((((unsigned int)t->curp) + (align-1)) & ~(align-1)); ++ if (p >= t->uplim || p + size > t->uplim) return 0; ++ t->curp = p + size; ++ return p; +} + -+#if 0 -+static unsigned char calc_idprom_cksum(struct idprom *idprom) ++void *mem_zalloc(struct mem *t, int size, int align) +{ -+ unsigned char cksum, i, *ptr = (unsigned char *)idprom; -+ -+ for (i = cksum = 0; i <= 0x0E; i++) -+ cksum ^= *ptr++; ++ char *p; + -+ return cksum; ++ if ((p = mem_alloc(t, size, align)) != 0) bzero(p, size); ++ return p; +} -+#endif + -+static int obp_nbgetchar(void) { -+ return -1; ++/* ++ * Library functions ++ */ ++void bzero(void *s, int len) { ++ while (len--) *((char *)s)++ = 0; +} + -+static int obp_nbputchar(int ch) { -+ extern struct vconterm dp0; -+ char buf = ch; ++void bcopy(const void *f, void *t, int len) { ++ while (len--) *((char *)t)++ = *((char *)f)++; ++} + -+ /* We do not use printk() in order to reduce stack depth. */ -+ vcon_write(&dp0, &buf, 1); ++/* Comparison is 7-bit */ ++int bcmp(const void *s1, const void *s2, int len) ++{ ++ int i; ++ char ch; ++ ++ while (len--) { ++ ch = *((char *)s1)++; ++ if ((i = ch - *((char *)s2)++) != 0) ++ return i; ++ if (ch == 0) ++ return 0; ++ } + return 0; +} + -+static void obp_reboot(char *str) { -+ printk("rebooting (%s): not implemented, freezing\n", str); -+ for (;;) {} ++int strlen(const char *s) { ++ const char *p; ++ for (p = s; *p != 0; p++) { } ++ return p - s; +} + -+static void obp_abort() { -+ printk("abort, freezing\n"); -+ for (;;) {} -+} ++extern void *printk_fn; + -+static void obp_halt() { -+ printk("halt, freezing\n"); -+ for (;;) {} ++void printk(char *fmt, ...) ++{ ++ struct prf_fp { ++ void *xfp; ++ void (*write)(void *, char *, int); ++ } prfa; ++ extern void prf(struct prf_fp *, char *fmt, va_list adx); ++ va_list x1; ++ ++ va_start(x1, fmt); ++ prfa.xfp = &dp0; ++ prfa.write = printk_fn; ++ prf(&prfa, fmt, x1); ++ va_end(x1); +} + -+static int obp_devopen(char *str) { -+ //printk("open %s\n", str); -+ return 0; ++void fatal() ++{ ++ printk("fatal."); ++loop: goto loop; +} + -+static int obp_devclose(int dev_desc) { -+ //printk("close %d\n", dev_desc); -+ return 0; ++/* ++ * Get the highest bit number from the mask. ++ */ ++int highc(int mask, int size) ++{ ++ int m1; ++ ++ m1 = 1 << size; ++ while (size != 0) { ++ size--; ++ m1 >>= 1; ++ if (m1 & mask) break; ++ } ++ return size; +} + -+static int obp_rdblkdev(int dev_desc, int num_blks, int blk_st, char *buf) { -+ //printk("rdblkdev: fd %d, num_blks %d, blk_st %d, buf 0x%x\n", dev_desc, num_blks, blk_st, buf); -+ //buf[8] = 'L'; -+ return num_blks; ++/* ++ */ ++unsigned int ld_bp_swap(unsigned int ptr) { ++ unsigned int n; ++ n = ld_bypass(ptr); ++ n = (n>>24 & 0xFF) | (n>>8 & 0xFF00) | ((n&0xFF00) << 8) | (n<<24); ++ return n; +} -diff -ruN proll_18.orig/src/arp.c proll-patch4/src/arp.c ++ ++void st_bp_swap(unsigned int ptr, unsigned int n) { ++ n = (n>>24 & 0xFF) | (n>>8 & 0xFF00) | ((n&0xFF00) << 8) | (n<<24); ++ st_bypass(ptr, n); ++}; +diff -ruN proll_18.orig/src/arp.c proll-patch7/src/arp.c --- proll_18.orig/src/arp.c 2001-12-24 05:12:31.000000000 +0000 -+++ proll-patch4/src/arp.c 2004-11-13 15:50:49.000000000 +0000 ++++ proll-patch7/src/arp.c 2004-11-13 15:50:49.000000000 +0000 @@ -45,7 +45,7 @@ #endif static struct arp_cache arp_list[ARPNUM]; /* ARP address cache */ @@ -1475,9 +1967,9 @@ diff -ruN proll_18.orig/src/arp.c proll-patch4/src/arp.c + def_gw = IP_ANY; return(TRUE); } -diff -ruN proll_18.orig/src/arp.h proll-patch4/src/arp.h +diff -ruN proll_18.orig/src/arp.h proll-patch7/src/arp.h --- proll_18.orig/src/arp.h 1999-03-18 03:39:43.000000000 +0000 -+++ proll-patch4/src/arp.h 2004-11-13 15:50:49.000000000 +0000 ++++ proll-patch7/src/arp.h 2004-11-13 15:50:49.000000000 +0000 @@ -104,7 +104,7 @@ extern int init_arp __P((void)); @@ -1487,24 +1979,35 @@ diff -ruN proll_18.orig/src/arp.h proll-patch4/src/arp.h /* Add a new antry to the ARP cache */ extern void addcache __P((unsigned char *ha, t_ipaddr ip)); -diff -ruN proll_18.orig/src/hconsole.c proll-patch4/src/hconsole.c +diff -ruN proll_18.orig/src/hconsole.c proll-patch7/src/hconsole.c --- proll_18.orig/src/hconsole.c 2002-07-23 05:52:48.000000000 +0000 -+++ proll-patch4/src/hconsole.c 2004-11-13 15:50:49.000000000 +0000 -@@ -42,7 +42,11 @@ ++++ proll-patch7/src/hconsole.c 2005-03-02 17:03:09.000000000 +0000 +@@ -29,6 +29,10 @@ + struct raster r_master; /* For a case of resize, whole fb */ + struct raster r_0; /* malloc() erzatz */ + ++#ifdef QEMU ++extern unsigned int q_height, q_width; ++#endif ++ + int hcon_init(struct hconsole *t, unsigned int a0) + { + struct raster *q, *r; +@@ -42,7 +46,11 @@ * No probing sequence or argument passing, hardcode everything. XXX */ raster8_cons_a(q, 768, 1024, (char *)a0); -+#if 1 ++#ifndef QEMU raster_cons_2(r, q, 768-(24*11)-1, 1024-(8*80)-1, (24*11), (8*80)); +#else -+ raster_cons_2(r, q, 0, 0, 768, 1024); ++ raster_cons_2(r, q, 0, 0, q_height, q_width); +#endif t->r_ = r; t->r0_ = q; t->f_ = &f_master; -diff -ruN proll_18.orig/src/lat7_2.bm proll-patch4/src/lat7_2.bm +diff -ruN proll_18.orig/src/lat7_2.bm proll-patch7/src/lat7_2.bm --- proll_18.orig/src/lat7_2.bm 1999-02-27 05:48:54.000000000 +0000 -+++ proll-patch4/src/lat7_2.bm 2004-11-13 15:50:49.000000000 +0000 ++++ proll-patch7/src/lat7_2.bm 2004-11-13 15:50:49.000000000 +0000 @@ -1,6 +1,6 @@ #define lat7_2_width 128 #define lat7_2_height 88 @@ -1513,9 +2016,9 @@ diff -ruN proll_18.orig/src/lat7_2.bm proll-patch4/src/lat7_2.bm 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xaa, 0x12, 0x1e, 0x0c, 0x02, 0x70, 0x18, 0x22, 0x22, 0x18, 0x00, 0x00, 0x18, 0x18, 0xff, 0x18, 0x00, 0x12, 0x02, -diff -ruN proll_18.orig/src/lat7_2_swapped.bm proll-patch4/src/lat7_2_swapped.bm +diff -ruN proll_18.orig/src/lat7_2_swapped.bm proll-patch7/src/lat7_2_swapped.bm --- proll_18.orig/src/lat7_2_swapped.bm 1970-01-01 00:00:00.000000000 +0000 -+++ proll-patch4/src/lat7_2_swapped.bm 2004-11-13 15:50:49.000000000 +0000 ++++ proll-patch7/src/lat7_2_swapped.bm 2004-11-13 15:50:49.000000000 +0000 @@ -0,0 +1,121 @@ +#define lat7_2_width 128 +#define lat7_2_height 88 @@ -1638,9 +2141,9 @@ diff -ruN proll_18.orig/src/lat7_2_swapped.bm proll-patch4/src/lat7_2_swapped.bm + 0x18, 0x18, 0x30, 0x00, 0x00, 0x00, 0x00, 0x36, 0x6c, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7e, 0x42, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00}; -diff -ruN proll_18.orig/src/le.c proll-patch4/src/le.c +diff -ruN proll_18.orig/src/le.c proll-patch7/src/le.c --- proll_18.orig/src/le.c 2002-07-23 05:52:49.000000000 +0000 -+++ proll-patch4/src/le.c 2004-11-13 15:50:49.000000000 +0000 ++++ proll-patch7/src/le.c 2004-11-13 15:50:49.000000000 +0000 @@ -185,8 +185,6 @@ unsigned short rap; /* register address port */ }; @@ -1650,9 +2153,9 @@ diff -ruN proll_18.orig/src/le.c proll-patch4/src/le.c /* The Lance uses 24 bit addresses */ /* On the Sun4c the DVMA will provide the remaining bytes for us */ /* On the Sun4m we have to instruct the ledma to provide them */ -diff -ruN proll_18.orig/src/netinit.c proll-patch4/src/netinit.c +diff -ruN proll_18.orig/src/netinit.c proll-patch7/src/netinit.c --- proll_18.orig/src/netinit.c 2002-09-13 21:53:33.000000000 +0000 -+++ proll-patch4/src/netinit.c 2004-11-13 15:50:49.000000000 +0000 ++++ proll-patch7/src/netinit.c 2004-11-13 15:50:49.000000000 +0000 @@ -49,13 +49,20 @@ unsigned char myhwaddr[ETH_ALEN]; /* my own hardware addr */ t_ipaddr myipaddr; /* my own IP address */ @@ -1696,9 +2199,9 @@ diff -ruN proll_18.orig/src/netinit.c proll-patch4/src/netinit.c fatal(); } } -diff -ruN proll_18.orig/src/netpriv.h proll-patch4/src/netpriv.h +diff -ruN proll_18.orig/src/netpriv.h proll-patch7/src/netpriv.h --- proll_18.orig/src/netpriv.h 1999-04-27 05:39:37.000000000 +0000 -+++ proll-patch4/src/netpriv.h 2004-11-13 15:50:49.000000000 +0000 ++++ proll-patch7/src/netpriv.h 2004-11-13 15:50:49.000000000 +0000 @@ -130,10 +130,9 @@ * */ @@ -1720,9 +2223,9 @@ diff -ruN proll_18.orig/src/netpriv.h proll-patch4/src/netpriv.h /* Empty read buffer */ extern void empty_buf __P((void)); -diff -ruN proll_18.orig/src/openprom.h proll-patch4/src/openprom.h +diff -ruN proll_18.orig/src/openprom.h proll-patch7/src/openprom.h --- proll_18.orig/src/openprom.h 2002-07-14 02:26:30.000000000 +0000 -+++ proll-patch4/src/openprom.h 2004-11-13 15:50:49.000000000 +0000 ++++ proll-patch7/src/openprom.h 2004-11-13 15:50:49.000000000 +0000 @@ -54,20 +54,20 @@ }; @@ -1784,9 +2287,9 @@ diff -ruN proll_18.orig/src/openprom.h proll-patch4/src/openprom.h }; /* More fun PROM structures for device probing. */ -diff -ruN proll_18.orig/src/packet.c proll-patch4/src/packet.c +diff -ruN proll_18.orig/src/packet.c proll-patch7/src/packet.c --- proll_18.orig/src/packet.c 2000-02-11 04:56:45.000000000 +0000 -+++ proll-patch4/src/packet.c 2004-11-13 15:50:49.000000000 +0000 ++++ proll-patch7/src/packet.c 2004-11-13 15:50:49.000000000 +0000 @@ -41,7 +41,7 @@ int aligner; } wbuf; @@ -1814,9 +2317,9 @@ diff -ruN proll_18.orig/src/packet.c proll-patch4/src/packet.c { struct sk_buff *skb; unsigned char *s; -diff -ruN proll_18.orig/src/printf.c proll-patch4/src/printf.c +diff -ruN proll_18.orig/src/printf.c proll-patch7/src/printf.c --- proll_18.orig/src/printf.c 1999-03-19 07:03:59.000000000 +0000 -+++ proll-patch4/src/printf.c 2004-11-13 15:50:49.000000000 +0000 ++++ proll-patch7/src/printf.c 2004-11-13 15:50:49.000000000 +0000 @@ -19,7 +19,7 @@ static void printn(struct prf_fp *, unsigned long, unsigned int); static void putchar(char, struct prf_fp *); @@ -1844,9 +2347,9 @@ diff -ruN proll_18.orig/src/printf.c proll-patch4/src/printf.c putchar(c,filog); } else if (c == 'l' || c == 'O') { printn(filog, (long)va_arg(adx,long), c=='l'?10:8); -diff -ruN proll_18.orig/src/rconsole.c proll-patch4/src/rconsole.c +diff -ruN proll_18.orig/src/rconsole.c proll-patch7/src/rconsole.c --- proll_18.orig/src/rconsole.c 1999-01-16 07:16:55.000000000 +0000 -+++ proll-patch4/src/rconsole.c 2004-11-13 15:50:49.000000000 +0000 ++++ proll-patch7/src/rconsole.c 2004-11-13 15:50:49.000000000 +0000 @@ -28,12 +28,18 @@ * move to California. Only plain lat7 survived. * I recreated lat7-1 changes in lat7-2. --zaitcev @@ -1901,9 +2404,9 @@ diff -ruN proll_18.orig/src/rconsole.c proll-patch4/src/rconsole.c p->nchars_ = LAT7_NCHARS; p->width_ = LAT7_WIDTH; p->height_ = LAT7_HEIGHT; -diff -ruN proll_18.orig/src/rconsole.h proll-patch4/src/rconsole.h +diff -ruN proll_18.orig/src/rconsole.h proll-patch7/src/rconsole.h --- proll_18.orig/src/rconsole.h 1999-01-16 05:00:59.000000000 +0000 -+++ proll-patch4/src/rconsole.h 2004-11-13 15:50:49.000000000 +0000 ++++ proll-patch7/src/rconsole.h 2004-11-13 15:50:49.000000000 +0000 @@ -13,10 +13,10 @@ */ @@ -1917,9 +2420,9 @@ diff -ruN proll_18.orig/src/rconsole.h proll-patch4/src/rconsole.h int nchars_; /* 128 for ASCII ... 65536 for Unicode */ int width_; /* [Pixels]. Maximum size is 16. */ int height_; /* [Pixels == scan lines]. */ -diff -ruN proll_18.orig/src/romlib.h proll-patch4/src/romlib.h +diff -ruN proll_18.orig/src/romlib.h proll-patch7/src/romlib.h --- proll_18.orig/src/romlib.h 1999-04-20 04:26:45.000000000 +0000 -+++ proll-patch4/src/romlib.h 2004-11-13 15:50:49.000000000 +0000 ++++ proll-patch7/src/romlib.h 2004-11-13 15:50:49.000000000 +0000 @@ -73,12 +73,12 @@ #define memcpy(dst, src, len) bcopy(src, dst, len) #define memcmp(x1, x2, len) bcmp(x1, x2, len) @@ -1936,9 +2439,9 @@ diff -ruN proll_18.orig/src/romlib.h proll-patch4/src/romlib.h /* -diff -ruN proll_18.orig/src/sched_4m.c proll-patch4/src/sched_4m.c +diff -ruN proll_18.orig/src/sched_4m.c proll-patch7/src/sched_4m.c --- proll_18.orig/src/sched_4m.c 1999-04-27 05:48:51.000000000 +0000 -+++ proll-patch4/src/sched_4m.c 2004-11-13 15:50:49.000000000 +0000 ++++ proll-patch7/src/sched_4m.c 2004-11-13 15:50:49.000000000 +0000 @@ -108,7 +108,7 @@ static int set_bolt; /* Tick counter limit */ static struct handsc hndv[16]; @@ -1948,9 +2451,9 @@ diff -ruN proll_18.orig/src/sched_4m.c proll-patch4/src/sched_4m.c 0, 0, 0, 0, 0, 0, SUN4M_INT_ETHERNET, 0, 0, 0, 0, 0, 0, 0, 0, 0, }; -diff -ruN proll_18.orig/src/swap.c proll-patch4/src/swap.c +diff -ruN proll_18.orig/src/swap.c proll-patch7/src/swap.c --- proll_18.orig/src/swap.c 1970-01-01 00:00:00.000000000 +0000 -+++ proll-patch4/src/swap.c 2004-11-13 15:50:49.000000000 +0000 ++++ proll-patch7/src/swap.c 2004-11-13 15:50:49.000000000 +0000 @@ -0,0 +1,21 @@ +// Convert the lat7 font so that no conversion is needed at runtime. +#define ORIG @@ -1973,9 +2476,9 @@ diff -ruN proll_18.orig/src/swap.c proll-patch4/src/swap.c + } + printf("\n"); +} -diff -ruN proll_18.orig/src/system.c proll-patch4/src/system.c +diff -ruN proll_18.orig/src/system.c proll-patch7/src/system.c --- proll_18.orig/src/system.c 2002-07-23 05:52:49.000000000 +0000 -+++ proll-patch4/src/system.c 2004-11-13 15:50:49.000000000 +0000 ++++ proll-patch7/src/system.c 2004-11-13 15:50:49.000000000 +0000 @@ -298,8 +298,8 @@ } @@ -2028,9 +2531,9 @@ diff -ruN proll_18.orig/src/system.c proll-patch4/src/system.c void fatal() { printk("fatal."); -diff -ruN proll_18.orig/src/system.h proll-patch4/src/system.h +diff -ruN proll_18.orig/src/system.h proll-patch7/src/system.h --- proll_18.orig/src/system.h 2002-09-13 21:53:32.000000000 +0000 -+++ proll-patch4/src/system.h 2004-11-13 15:50:49.000000000 +0000 ++++ proll-patch7/src/system.h 2004-11-13 15:50:49.000000000 +0000 @@ -16,7 +16,7 @@ #define IOMAPSIZE (1*1024*1024) /* 1 Meg maximum: we do not map framebuffer. */ #define NCTX_SWIFT 0x100 @@ -2040,9 +2543,9 @@ diff -ruN proll_18.orig/src/system.h proll-patch4/src/system.h #ifndef __ASSEMBLY__ struct bank { -diff -ruN proll_18.orig/src/udp.c proll-patch4/src/udp.c +diff -ruN proll_18.orig/src/udp.c proll-patch7/src/udp.c --- proll_18.orig/src/udp.c 2001-12-24 05:12:53.000000000 +0000 -+++ proll-patch4/src/udp.c 2004-11-13 15:50:49.000000000 +0000 ++++ proll-patch7/src/udp.c 2004-11-13 15:50:49.000000000 +0000 @@ -81,7 +81,7 @@ int source; int dest; @@ -2062,3 +2565,263 @@ diff -ruN proll_18.orig/src/udp.c proll-patch4/src/udp.c /* Register IP packet type and set write buffer pointer */ if ((writebuf = reg_type(htons(ETH_P_IP), ip_recv)) == NULL) return(FALSE); +diff -ruN proll_18.orig/src/vcons_zs.c proll-patch7/src/vcons_zs.c +--- proll_18.orig/src/vcons_zs.c 1970-01-01 00:00:00.000000000 +0000 ++++ proll-patch7/src/vcons_zs.c 2005-03-02 12:07:41.000000000 +0000 +@@ -0,0 +1,68 @@ ++/** ++ ** Console over 'zs' (Zilog serial port) ++ ** Copyright 1999 Pete Zaitcev ++ ** This code is licensed under GNU General Public License. ++ **/ ++ ++#include "vconsole.h" ++#include ++ ++#define ZS_DATA 0x02 ++ ++int vcon_zs_init(struct vconterm *t, unsigned int a0) ++{ ++ ++ t->impl = (void *) a0; ++ ++ t->vc_x = 0; t->vc_y = 0; ++ t->backp = 0; t->backc = 0; ++ ++ stb_bypass(a0, 3); // reg 3 ++ stb_bypass(a0, 1); // enable rx ++ ++ stb_bypass(a0, 5); // reg 5 ++ stb_bypass(a0, 8); // enable tx ++ ++ return 0; ++} ++ ++int vcon_zs_putch(struct vconterm *t, char c) ++{ ++ unsigned zs_ptr = (unsigned) t->impl; ++ ++ //while ((ldb_bypass(zs_ptr + ZS_LSR) & 0x60) != 0x60) { } ++ stb_bypass(zs_ptr + ZS_DATA, c); ++ return 0; ++} ++ ++int vcon_zs_write(struct vconterm *t, char *data, int leng) ++{ ++ while (leng != 0) { ++ leng--; ++ vcon_zs_putch(t, *data++); ++ } ++ return leng; ++} ++ ++int vcon_zs_read(struct vconterm *t, char *data, int leng) ++{ ++ unsigned zs_ptr = (unsigned) t->impl; ++ ++ while ((ldb_bypass(zs_ptr) & 1) != 1) { } ++ *data = ldb_bypass(zs_ptr + ZS_DATA); ++ return 0; ++} ++ ++int vcon_zs_getch(struct vconterm *t) ++{ ++ unsigned zs_ptr = (unsigned) t->impl; ++ ++ while ((ldb_bypass(zs_ptr) & 1) != 1) { } ++ return ldb_bypass(zs_ptr + ZS_DATA); ++} ++ ++void vcon_zs_fini(struct vconterm *t) ++{ ++ /* violent crash in the end */ ++ ; ++} +diff -ruN proll_18.orig/src/vconsole.c proll-patch7/src/vconsole.c +--- proll_18.orig/src/vconsole.c 1999-11-08 03:10:28.000000000 +0000 ++++ proll-patch7/src/vconsole.c 2005-03-02 14:29:05.000000000 +0000 +@@ -13,6 +13,10 @@ + + struct hconsole hcons0; + ++enum { ESnormal, ESesc, ESsquare, ESgetpars, ESgotpars, ESfunckey, ++ EShash, ESsetG0, ESsetG1, ESpercent, ESignore, ESnonstd, ++ ESpalette }; ++ + int vcon_init(struct vconterm *t, unsigned int a0) + { + struct hconsole *hconp; +@@ -25,11 +29,49 @@ + + t->vc_x = 0; t->vc_y = 0; + t->backp = 0; t->backc = 0; ++ t->vc_state = ESnormal; + + hcon_clear(hconp, 0, 0, hconp->ydim_, hconp->xdim_); + return 0; + } + ++/* ++ * gotoxy() must verify all boundaries, because the arguments ++ * might also be negative. If the given position is out of ++ * bounds, the cursor is placed at the nearest margin. ++ */ ++static void gotoxy(struct vconterm *vc, int new_x, int new_y) ++{ ++ int max_x, max_y; ++ struct hconsole *hconp = vc->impl; ++ ++ max_x = hcon_qxdim(hconp); ++ max_y = hcon_qydim(hconp); ++ ++ if (new_x < 0) ++ vc->vc_x = 0; ++ else { ++ if (new_x >= max_x) ++ vc->vc_x = max_x - 1; ++ else ++ vc->vc_x = new_x; ++ } ++ ++ if (new_y < 0) ++ vc->vc_y = 0; ++ else if (new_y >= max_y) ++ vc->vc_y = max_y - 1; ++ else ++ vc->vc_y = new_y; ++ ++} ++ ++/* for absolute user moves, when decom is set */ ++static void gotoxay(struct vconterm *t, int new_x, int new_y) ++{ ++ gotoxy(t, new_x, new_y); ++} ++ + int vcon_write(struct vconterm *t, char *data, int leng) + { + int l = leng; +@@ -40,29 +82,84 @@ + if (l <= 0) break; + c = *data++; --l; + +- switch (c) { +- case 0x07: /* Bell */ +- vcon_i_backflush(t); +- break; +- case 0x0A: /* Linefeed */ +- vcon_i_backflush(t); +- vcon_i_cursfeed(t); ++ switch(t->vc_state) { ++ case ESesc: ++ t->vc_state = ESnormal; ++ switch (c) { ++ case '[': ++ t->vc_state = ESsquare; ++ break; ++ case 'M': ++ hcon_scroll(hconp, 0, hcon_qydim(hconp), SM_UP, 1); ++ break; ++ } + break; +- case 0x0D: /* Return */ +- vcon_i_backflush(t); +- t->vc_x = 0; ++ case ESsquare: ++ for(t->vc_npar = 0 ; t->vc_npar < NPAR ; t->vc_npar++) ++ t->vc_par[t->vc_npar] = 0; ++ t->vc_npar = 0; ++ t->vc_state = ESgetpars; ++ case ESgetpars: ++ if (c==';' && t->vc_nparvc_npar++; ++ break; ++ } else if (c>='0' && c<='9') { ++ t->vc_par[t->vc_npar] *= 10; ++ t->vc_par[t->vc_npar] += c-'0'; ++ break; ++ } else t->vc_state=ESgotpars; ++ case ESgotpars: ++ t->vc_state = ESnormal; ++ switch(c) { ++ case 'H': case 'f': ++ if (t->vc_par[0]) t->vc_par[0]--; ++ if (t->vc_par[1]) t->vc_par[1]--; ++ gotoxay(t, t->vc_par[1], t->vc_par[0]); ++ break; ++ case 'M': ++ hcon_scroll(hconp, 0, hcon_qydim(hconp), SM_UP, 1); ++ break; ++ } + break; + default: +- if (t->backp == 0) { +- t->backc = 1; +- t->backp = data-1; +- } else { +- t->backc++; +- } +- if (t->vc_x + t->backc >= hcon_qxdim(hconp)) { ++ t->vc_state = ESnormal; ++ switch (c) { ++ case 0x07: /* Bell */ ++ vcon_i_backflush(t); ++ break; ++ case 0x08: /* BS */ ++ vcon_i_backflush(t); ++ if (t->vc_x > 0) ++ t->vc_x--; ++ break; ++ case 0x0A: /* Linefeed */ + vcon_i_backflush(t); +- t->vc_x = 0; + vcon_i_cursfeed(t); ++ break; ++ case 0x0D: /* Return */ ++ vcon_i_backflush(t); ++ t->vc_x = 0; ++ break; ++ case 24: case 26: ++ vcon_i_backflush(t); ++ t->vc_state = ESnormal; ++ break; ++ case 27: ++ vcon_i_backflush(t); ++ t->vc_state = ESesc; ++ break; ++ default: ++ if (t->backp == 0) { ++ t->backc = 1; ++ t->backp = data-1; ++ } else { ++ t->backc++; ++ } ++ if (t->vc_x + t->backc >= hcon_qxdim(hconp)) { ++ vcon_i_backflush(t); ++ t->vc_x = 0; ++ vcon_i_cursfeed(t); ++ } + } + } + } +diff -ruN proll_18.orig/src/vconsole.h proll-patch7/src/vconsole.h +--- proll_18.orig/src/vconsole.h 1999-11-08 00:58:13.000000000 +0000 ++++ proll-patch7/src/vconsole.h 2005-03-02 12:40:12.000000000 +0000 +@@ -6,6 +6,8 @@ + #ifndef VCONSOLE_H + #define VCONSOLE_H + ++#define NPAR 16 ++ + struct vconterm { + void *impl; + +@@ -13,6 +15,8 @@ + int backc; /* Same, count */ + + int vc_x, vc_y; /* XXX Make vcon_xxx() to use cellmap->xpos_ */ ++ int vc_state; ++ unsigned int vc_npar,vc_par[NPAR]; /* Parameters of current escape sequence */ + }; + + int vcon_init(struct vconterm *t, unsigned int a0); diff --git a/target-sparc/helper.c b/target-sparc/helper.c index bf28a367561..e6891ccbb16 100644 --- a/target-sparc/helper.c +++ b/target-sparc/helper.c @@ -138,6 +138,7 @@ int get_physical_address (CPUState *env, target_phys_addr_t *physical, int *prot } *access_index = ((rw & 1) << 2) | (rw & 2) | (is_user? 0 : 1); + *physical = 0xfffff000; /* SPARC reference MMU table walk: Context table->L1->L2->PTE */ /* Context base + context number */ @@ -210,7 +211,7 @@ int get_physical_address (CPUState *env, target_phys_addr_t *physical, int *prot /* check access */ access_perms = (pde & PTE_ACCESS_MASK) >> PTE_ACCESS_SHIFT; error_code = access_table[*access_index][access_perms]; - if (error_code) + if (error_code && !(env->mmuregs[0] & MMU_NF)) return error_code; /* the page can be put in the TLB */ @@ -225,7 +226,7 @@ int get_physical_address (CPUState *env, target_phys_addr_t *physical, int *prot /* Even if large ptes, we map only one 4KB page in the cache to avoid filling it too fast */ *physical = ((pde & PTE_ADDR_MASK) << 4) + page_offset; - return 0; + return error_code; } /* Perform address translation */ @@ -251,17 +252,14 @@ int cpu_sparc_handle_mmu_fault (CPUState *env, target_ulong address, int rw, env->mmuregs[4] = address; /* Fault address register */ if ((env->mmuregs[0] & MMU_NF) || env->psret == 0) { -#if 0 - // No fault + // No fault mode: if a mapping is available, just override + // permissions. If no mapping is available, redirect accesses to + // neverland. Fake/overridden mappings will be flushed when + // switching to normal mode. vaddr = address & TARGET_PAGE_MASK; - paddr = 0xfffff000; prot = PAGE_READ | PAGE_WRITE; ret = tlb_set_page(env, vaddr, paddr, prot, is_user, is_softmmu); return ret; -#else - cpu_abort(env, "MMU no fault case no handled"); - return 0; -#endif } else { if (rw & 2) env->exception_index = TT_TFAULT; @@ -316,8 +314,8 @@ void do_interrupt(int intno) count, intno, env->pc, env->npc, env->regwptr[6]); -#if 1 cpu_dump_state(env, logfile, fprintf, 0); +#if 0 { int i; uint8_t *ptr; diff --git a/target-sparc/op_helper.c b/target-sparc/op_helper.c index 4c65c64d67b..9cb3de49ac5 100644 --- a/target-sparc/op_helper.c +++ b/target-sparc/op_helper.c @@ -164,7 +164,9 @@ void helper_st_asi(int asi, int size, int sign) case 0: env->mmuregs[reg] &= ~(MMU_E | MMU_NF); env->mmuregs[reg] |= T1 & (MMU_E | MMU_NF); - if ((oldreg & MMU_E) != (env->mmuregs[reg] & MMU_E)) + // Mappings generated during no-fault mode or MMU + // disabled mode are invalid in normal mode + if (oldreg != env->mmuregs[reg]) tlb_flush(env, 1); break; case 2: diff --git a/vl.c b/vl.c index 9efb4f7daad..a815a50fa8c 100644 --- a/vl.c +++ b/vl.c @@ -2733,7 +2733,9 @@ void help(void) "-full-screen start in full screen\n" #ifdef TARGET_PPC "-prep Simulate a PREP system (default is PowerMAC)\n" - "-g WxH[xDEPTH] Set the initial VGA graphic mode\n" +#endif +#if defined(TARGET_PPC) || defined(TARGET_SPARC) + "-g WxH[xDEPTH] Set the initial graphical resolution and depth\n" #endif "\n" "Network options:\n" @@ -2916,6 +2918,8 @@ const QEMUOption qemu_options[] = { #endif #ifdef TARGET_PPC { "prep", 0, QEMU_OPTION_prep }, +#endif +#if defined(TARGET_PPC) || defined(TARGET_SPARC) { "g", 1, QEMU_OPTION_g }, #endif { "localtime", 0, QEMU_OPTION_localtime }, @@ -3179,6 +3183,10 @@ int main(int argc, char **argv) case QEMU_OPTION_boot: boot_device = optarg[0]; if (boot_device != 'a' && +#ifdef TARGET_SPARC + // Network boot + boot_device != 'n' && +#endif boot_device != 'c' && boot_device != 'd') { fprintf(stderr, "qemu: invalid boot device '%c'\n", boot_device); exit(1); diff --git a/vl.h b/vl.h index c8404e10e5b..5091ca14e7a 100644 --- a/vl.h +++ b/vl.h @@ -714,7 +714,7 @@ void lance_init(NetDriverState *nd, int irq, uint32_t leaddr, uint32_t ledaddr); /* tcx.c */ void *tcx_init(DisplayState *ds, uint32_t addr, uint8_t *vram_base, - unsigned long vram_offset, int vram_size); + unsigned long vram_offset, int vram_size, int width, int height); void tcx_update_display(void *opaque); void tcx_invalidate_display(void *opaque); void tcx_screen_dump(void *opaque, const char *filename); @@ -736,6 +736,9 @@ void slavio_timer_init(uint32_t addr1, int irq1, uint32_t addr2, int irq2); SerialState *slavio_serial_init(int base, int irq, CharDriverState *chr1, CharDriverState *chr2); void slavio_serial_ms_kbd_init(int base, int irq); +/* esp.c */ +void esp_init(BlockDriverState **bd, int irq, uint32_t espaddr, uint32_t espdaddr); + /* NVRAM helpers */ #include "hw/m48t59.h" -- 2.39.5