diff options
| -rw-r--r-- | cpu-all.h | 2 | ||||
| -rw-r--r-- | exec.c | 8 | ||||
| -rw-r--r-- | hw/sun4m.c | 21 | ||||
| -rw-r--r-- | hw/sun4m.h | 3 | ||||
| -rw-r--r-- | hw/tcx.c | 8 |
5 files changed, 26 insertions, 16 deletions
@@ -906,6 +906,8 @@ static inline void cpu_register_physical_memory(target_phys_addr_t start_addr, ram_addr_t cpu_get_physical_page_desc(target_phys_addr_t addr); ram_addr_t qemu_ram_alloc(ram_addr_t); void qemu_ram_free(ram_addr_t addr); +/* This should only be used for ram local to a device. */ +void *qemu_get_ram_ptr(ram_addr_t addr); int cpu_register_io_memory(int io_index, CPUReadMemoryFunc **mem_read, CPUWriteMemoryFunc **mem_write, @@ -2427,6 +2427,14 @@ void qemu_ram_free(ram_addr_t addr) { } +/* Return a host pointer to ram allocated with qemu_ram_alloc. + This may only be used if you actually allocated the ram, and + aready know how but the ram block is. */ +void *qemu_get_ram_ptr(ram_addr_t addr) +{ + return phys_ram_base + addr; +} + static uint32_t unassigned_mem_readb(void *opaque, target_phys_addr_t addr) { #ifdef DEBUG_UNASSIGNED diff --git a/hw/sun4m.c b/hw/sun4m.c index 9b3bab1de7..a459055704 100644 --- a/hw/sun4m.c +++ b/hw/sun4m.c @@ -382,7 +382,7 @@ static void sun4m_hw_init(const struct sun4m_hwdef *hwdef, ram_addr_t RAM_size, qemu_irq *esp_reset, *le_reset; qemu_irq *fdc_tc; qemu_irq *cpu_halt; - ram_addr_t ram_offset, prom_offset, tcx_offset, idreg_offset; + ram_addr_t ram_offset, prom_offset, idreg_offset; unsigned long kernel_size; int ret; char buf[1024]; @@ -478,9 +478,8 @@ static void sun4m_hw_init(const struct sun4m_hwdef *hwdef, ram_addr_t RAM_size, fprintf(stderr, "qemu: Unsupported depth: %d\n", graphic_depth); exit (1); } - tcx_offset = qemu_ram_alloc(hwdef->vram_size); - tcx_init(hwdef->tcx_base, phys_ram_base + tcx_offset, tcx_offset, - hwdef->vram_size, graphic_width, graphic_height, graphic_depth); + tcx_init(hwdef->tcx_base, hwdef->vram_size, graphic_width, graphic_height, + graphic_depth); lance_init(&nd_table[0], hwdef->le_base, ledma, *ledma_irq, le_reset); @@ -1183,7 +1182,7 @@ static void sun4d_hw_init(const struct sun4d_hwdef *hwdef, ram_addr_t RAM_size, qemu_irq *cpu_irqs[MAX_CPUS], *sbi_irq, *sbi_cpu_irq, *espdma_irq, *ledma_irq; qemu_irq *esp_reset, *le_reset; - ram_addr_t ram_offset, prom_offset, tcx_offset; + ram_addr_t ram_offset, prom_offset; unsigned long kernel_size; int ret; char buf[1024]; @@ -1264,9 +1263,8 @@ static void sun4d_hw_init(const struct sun4d_hwdef *hwdef, ram_addr_t RAM_size, fprintf(stderr, "qemu: Unsupported depth: %d\n", graphic_depth); exit (1); } - tcx_offset = qemu_ram_alloc(hwdef->vram_size); - tcx_init(hwdef->tcx_base, phys_ram_base + tcx_offset, tcx_offset, - hwdef->vram_size, graphic_width, graphic_height, graphic_depth); + tcx_init(hwdef->tcx_base, hwdef->vram_size, graphic_width, graphic_height, + graphic_depth); lance_init(&nd_table[0], hwdef->le_base, ledma, *ledma_irq, le_reset); @@ -1409,7 +1407,7 @@ static void sun4c_hw_init(const struct sun4c_hwdef *hwdef, ram_addr_t RAM_size, qemu_irq *cpu_irqs, *slavio_irq, *espdma_irq, *ledma_irq; qemu_irq *esp_reset, *le_reset; qemu_irq *fdc_tc; - ram_addr_t ram_offset, prom_offset, tcx_offset; + ram_addr_t ram_offset, prom_offset; unsigned long kernel_size; int ret; char buf[1024]; @@ -1481,9 +1479,8 @@ static void sun4c_hw_init(const struct sun4c_hwdef *hwdef, ram_addr_t RAM_size, fprintf(stderr, "qemu: Unsupported depth: %d\n", graphic_depth); exit (1); } - tcx_offset = qemu_ram_alloc(hwdef->vram_size); - tcx_init(hwdef->tcx_base, phys_ram_base + tcx_offset, tcx_offset, - hwdef->vram_size, graphic_width, graphic_height, graphic_depth); + tcx_init(hwdef->tcx_base, hwdef->vram_size, graphic_width, graphic_height, + graphic_depth); lance_init(&nd_table[0], hwdef->le_base, ledma, *ledma_irq, le_reset); diff --git a/hw/sun4m.h b/hw/sun4m.h index 219aaef2ea..726cd18646 100644 --- a/hw/sun4m.h +++ b/hw/sun4m.h @@ -24,8 +24,7 @@ static inline void sparc_iommu_memory_write(void *opaque, } /* tcx.c */ -void tcx_init(target_phys_addr_t addr, uint8_t *vram_base, - unsigned long vram_offset, int vram_size, int width, int height, +void tcx_init(target_phys_addr_t addr, int vram_size, int width, int height, int depth); /* slavio_intctl.c */ @@ -497,13 +497,17 @@ static CPUWriteMemoryFunc *tcx_dummy_write[3] = { tcx_dummy_writel, }; -void tcx_init(target_phys_addr_t addr, uint8_t *vram_base, - unsigned long vram_offset, int vram_size, int width, int height, +void tcx_init(target_phys_addr_t addr, int vram_size, int width, int height, int depth) { TCXState *s; int io_memory, dummy_memory; + ram_addr_t vram_offset; int size; + uint8_t *vram_base; + + vram_offset = qemu_ram_alloc(vram_size); + vram_base = qemu_get_ram_ptr(vram_offset); s = qemu_mallocz(sizeof(TCXState)); s->addr = addr; |