mirror of https://github.com/xemu-project/xemu.git
nv2a: Move some defs to nv2a.h and fix minor nits
This commit is contained in:
Matt Borgerson
Jannik Vogel
parent
10b3b06320
commit
f169ce4c26
|
|
@ -20,12 +20,11 @@
|
|||
*/
|
||||
|
||||
#include "qemu/osdep.h"
|
||||
#include "hw/display/vga_regs.h"
|
||||
#include "qapi/error.h"
|
||||
#include "qemu/error-report.h"
|
||||
#include "qemu/error-report.h"
|
||||
#include <assert.h>
|
||||
#include "nv2a.h"
|
||||
#include "hw/display/vga_regs.h"
|
||||
#include <assert.h>
|
||||
|
||||
#ifdef __WINNT__
|
||||
// HACK: mingw-w64 doesn't provide ffs, for now we just shove it here
|
||||
|
|
@ -34,20 +33,18 @@ int ffs(register int valu)
|
|||
{
|
||||
register int bit;
|
||||
|
||||
if (valu == 0)
|
||||
if (valu == 0) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
for (bit = 1; !(valu & 1); bit++)
|
||||
for (bit = 1; !(valu & 1); bit++) {
|
||||
valu >>= 1;
|
||||
}
|
||||
|
||||
return bit;
|
||||
}
|
||||
#endif
|
||||
|
||||
DMAObject nv_dma_load(NV2AState *d, hwaddr dma_obj_address);
|
||||
void *nv_dma_map(NV2AState *d, hwaddr dma_obj_address, hwaddr *len);
|
||||
void nv2a_init(PCIBus *bus, int devfn, MemoryRegion *ram);
|
||||
|
||||
void update_irq(NV2AState *d)
|
||||
{
|
||||
/* PFIFO */
|
||||
|
|
@ -113,38 +110,11 @@ void *nv_dma_map(NV2AState *d, hwaddr dma_obj_address, hwaddr *len)
|
|||
return d->vram_ptr + dma.address;
|
||||
}
|
||||
|
||||
#define DEFINE_PROTO(prefix) \
|
||||
uint64_t prefix ## _read(void *opaque, hwaddr addr, unsigned int size); \
|
||||
void prefix ## _write(void *opaque, hwaddr addr, uint64_t val, unsigned int size);
|
||||
|
||||
DEFINE_PROTO(pmc)
|
||||
DEFINE_PROTO(pbus)
|
||||
DEFINE_PROTO(pfifo)
|
||||
DEFINE_PROTO(prma)
|
||||
DEFINE_PROTO(pvideo)
|
||||
DEFINE_PROTO(ptimer)
|
||||
DEFINE_PROTO(pcounter)
|
||||
DEFINE_PROTO(pvpe)
|
||||
DEFINE_PROTO(ptv)
|
||||
DEFINE_PROTO(prmfb)
|
||||
DEFINE_PROTO(prmvio)
|
||||
DEFINE_PROTO(pfb)
|
||||
DEFINE_PROTO(pstraps)
|
||||
DEFINE_PROTO(pgraph)
|
||||
DEFINE_PROTO(pcrtc)
|
||||
DEFINE_PROTO(prmcio)
|
||||
DEFINE_PROTO(pramdac)
|
||||
DEFINE_PROTO(prmdio)
|
||||
// DEFINE_PROTO(pramin)
|
||||
DEFINE_PROTO(user)
|
||||
|
||||
#undef DEFINE_PROTO
|
||||
|
||||
#include "nv2a_pbus.c"
|
||||
#include "nv2a_pcrtc.c"
|
||||
#include "nv2a_pfb.c"
|
||||
#include "nv2a_pgraph.c"
|
||||
#include "nv2a_pfifo.c"
|
||||
#include "nv2a_pgraph.c"
|
||||
#include "nv2a_pmc.c"
|
||||
#include "nv2a_pramdac.c"
|
||||
#include "nv2a_prmcio.c"
|
||||
|
|
@ -154,42 +124,46 @@ DEFINE_PROTO(user)
|
|||
#include "nv2a_stubs.c"
|
||||
#include "nv2a_user.c"
|
||||
|
||||
const struct NV2ABlockInfo blocktable[] = {
|
||||
|
||||
#define ENTRY(NAME, OFFSET, SIZE, RDFUNC, WRFUNC) \
|
||||
[NV_##NAME] = { \
|
||||
.name = #NAME, .offset = OFFSET, .size = SIZE, \
|
||||
.name = #NAME, \
|
||||
.offset = OFFSET, \
|
||||
.size = SIZE, \
|
||||
.ops = { .read = RDFUNC, .write = WRFUNC }, \
|
||||
}, \
|
||||
}
|
||||
|
||||
ENTRY(PMC, 0x000000, 0x001000, pmc_read, pmc_write)
|
||||
ENTRY(PBUS, 0x001000, 0x001000, pbus_read, pbus_write)
|
||||
ENTRY(PFIFO, 0x002000, 0x002000, pfifo_read, pfifo_write)
|
||||
ENTRY(PRMA, 0x007000, 0x001000, prma_read, prma_write)
|
||||
ENTRY(PVIDEO, 0x008000, 0x001000, pvideo_read, pvideo_write)
|
||||
ENTRY(PTIMER, 0x009000, 0x001000, ptimer_read, ptimer_write)
|
||||
ENTRY(PCOUNTER, 0x00a000, 0x001000, pcounter_read, pcounter_write)
|
||||
ENTRY(PVPE, 0x00b000, 0x001000, pvpe_read, pvpe_write)
|
||||
ENTRY(PTV, 0x00d000, 0x001000, ptv_read, ptv_write)
|
||||
ENTRY(PRMFB, 0x0a0000, 0x020000, prmfb_read, prmfb_write)
|
||||
ENTRY(PRMVIO, 0x0c0000, 0x001000, prmvio_read, prmvio_write)
|
||||
ENTRY(PFB, 0x100000, 0x001000, pfb_read, pfb_write)
|
||||
ENTRY(PSTRAPS, 0x101000, 0x001000, pstraps_read, pstraps_write)
|
||||
ENTRY(PGRAPH, 0x400000, 0x002000, pgraph_read, pgraph_write)
|
||||
ENTRY(PCRTC, 0x600000, 0x001000, pcrtc_read, pcrtc_write)
|
||||
ENTRY(PRMCIO, 0x601000, 0x001000, prmcio_read, prmcio_write)
|
||||
ENTRY(PRAMDAC, 0x680000, 0x001000, pramdac_read, pramdac_write)
|
||||
ENTRY(PRMDIO, 0x681000, 0x001000, prmdio_read, prmdio_write)
|
||||
// ENTRY(PRAMIN, 0x700000, 0x100000, pramin_read, pramin_write)
|
||||
ENTRY(USER, 0x800000, 0x800000, user_read, user_write)
|
||||
#undef ENTRY
|
||||
const struct NV2ABlockInfo blocktable[] = {
|
||||
ENTRY(PMC, 0x000000, 0x001000, pmc_read, pmc_write),
|
||||
ENTRY(PBUS, 0x001000, 0x001000, pbus_read, pbus_write),
|
||||
ENTRY(PFIFO, 0x002000, 0x002000, pfifo_read, pfifo_write),
|
||||
ENTRY(PRMA, 0x007000, 0x001000, prma_read, prma_write),
|
||||
ENTRY(PVIDEO, 0x008000, 0x001000, pvideo_read, pvideo_write),
|
||||
ENTRY(PTIMER, 0x009000, 0x001000, ptimer_read, ptimer_write),
|
||||
ENTRY(PCOUNTER, 0x00a000, 0x001000, pcounter_read, pcounter_write),
|
||||
ENTRY(PVPE, 0x00b000, 0x001000, pvpe_read, pvpe_write),
|
||||
ENTRY(PTV, 0x00d000, 0x001000, ptv_read, ptv_write),
|
||||
ENTRY(PRMFB, 0x0a0000, 0x020000, prmfb_read, prmfb_write),
|
||||
ENTRY(PRMVIO, 0x0c0000, 0x001000, prmvio_read, prmvio_write),
|
||||
ENTRY(PFB, 0x100000, 0x001000, pfb_read, pfb_write),
|
||||
ENTRY(PSTRAPS, 0x101000, 0x001000, pstraps_read, pstraps_write),
|
||||
ENTRY(PGRAPH, 0x400000, 0x002000, pgraph_read, pgraph_write),
|
||||
ENTRY(PCRTC, 0x600000, 0x001000, pcrtc_read, pcrtc_write),
|
||||
ENTRY(PRMCIO, 0x601000, 0x001000, prmcio_read, prmcio_write),
|
||||
ENTRY(PRAMDAC, 0x680000, 0x001000, pramdac_read, pramdac_write),
|
||||
ENTRY(PRMDIO, 0x681000, 0x001000, prmdio_read, prmdio_write),
|
||||
// ENTRY(PRAMIN, 0x700000, 0x100000, pramin_read, pramin_write),
|
||||
ENTRY(USER, 0x800000, 0x800000, user_read, user_write),
|
||||
};
|
||||
|
||||
#undef ENTRY
|
||||
|
||||
const int blocktable_len = ARRAY_SIZE(blocktable);
|
||||
|
||||
// FIXME: Add nv2a_reg_names or remove this code
|
||||
// static const char* nv2a_reg_names[] = {};
|
||||
|
||||
void reg_log_read(int block, hwaddr addr, uint64_t val) {
|
||||
void reg_log_read(int block, hwaddr addr, uint64_t val)
|
||||
{
|
||||
if (blocktable[block].name) {
|
||||
// hwaddr naddr = blocktable[block].offset + addr;
|
||||
// if (naddr < ARRAY_SIZE(nv2a_reg_names) && nv2a_reg_names[naddr]) {
|
||||
|
|
@ -205,7 +179,8 @@ void reg_log_read(int block, hwaddr addr, uint64_t val) {
|
|||
}
|
||||
}
|
||||
|
||||
void reg_log_write(int block, hwaddr addr, uint64_t val) {
|
||||
void reg_log_write(int block, hwaddr addr, uint64_t val)
|
||||
{
|
||||
if (blocktable[block].name) {
|
||||
// hwaddr naddr = blocktable[block].offset + addr;
|
||||
// if (naddr < ARRAY_SIZE(nv2a_reg_names) && nv2a_reg_names[naddr]) {
|
||||
|
|
@ -395,7 +370,6 @@ static void nv2a_init_memory(NV2AState *d, MemoryRegion *ram)
|
|||
d->vga.vram_ptr = memory_region_get_ram_ptr(&d->vga.vram);
|
||||
vga_dirty_log_start(&d->vga);
|
||||
|
||||
|
||||
pgraph_init(d);
|
||||
|
||||
/* fire up puller */
|
||||
|
|
|
|||
|
|
@ -23,29 +23,27 @@
|
|||
#define HW_NV2A_H
|
||||
|
||||
#include "hw/hw.h"
|
||||
#include "hw/i386/pc.h"
|
||||
#include "ui/console.h"
|
||||
#include "hw/pci/pci.h"
|
||||
#include "ui/console.h"
|
||||
#include "hw/display/vga.h"
|
||||
#include "hw/display/vga_int.h"
|
||||
#include "qemu/thread.h"
|
||||
#include "hw/i386/pc.h"
|
||||
#include "hw/pci/pci.h"
|
||||
#include "qapi/qmp/qstring.h"
|
||||
#include "qemu/thread.h"
|
||||
#include "cpu.h"
|
||||
|
||||
#include "g-lru-cache.h"
|
||||
#include "swizzle.h"
|
||||
#include "nv2a_shaders.h"
|
||||
#include "nv2a_debug.h"
|
||||
#include "nv2a_int.h"
|
||||
|
||||
#include "nv2a_shaders.h"
|
||||
#include "swizzle.h"
|
||||
#include "gl/gloffscreen.h"
|
||||
|
||||
#define USE_TEXTURE_CACHE
|
||||
|
||||
#define GET_MASK(v, mask) (((v) & (mask)) >> (ffs(mask) - 1))
|
||||
|
||||
#define SET_MASK(v, mask, val) ({ \
|
||||
#define SET_MASK(v, mask, val) \
|
||||
({ \
|
||||
const unsigned int __val = (val); \
|
||||
const unsigned int __mask = (mask); \
|
||||
(v) &= ~(__mask); \
|
||||
|
|
@ -54,13 +52,12 @@
|
|||
|
||||
#define CASE_4(v, step) \
|
||||
case (v): \
|
||||
case (v)+(step): \
|
||||
case (v)+(step)*2: \
|
||||
case (v)+(step)*3
|
||||
case ((v) + (step)): \
|
||||
case ((v) + (step) * 2): \
|
||||
case ((v) + (step) * 3)
|
||||
|
||||
|
||||
#define NV2A_DEVICE(obj) \
|
||||
OBJECT_CHECK(NV2AState, (obj), "nv2a")
|
||||
#define NV2A_DEVICE(obj) OBJECT_CHECK(NV2AState, (obj), "nv2a")
|
||||
|
||||
void reg_log_read(int block, hwaddr addr, uint64_t val);
|
||||
void reg_log_write(int block, hwaddr addr, uint64_t val);
|
||||
|
|
@ -311,7 +308,6 @@ typedef struct PGRAPHState {
|
|||
uint32_t regs[0x2000];
|
||||
} PGRAPHState;
|
||||
|
||||
|
||||
typedef struct CacheEntry {
|
||||
QSIMPLEQ_ENTRY(CacheEntry) entry;
|
||||
unsigned int method : 14;
|
||||
|
|
@ -440,9 +436,45 @@ typedef struct NV2ABlockInfo {
|
|||
extern const struct NV2ABlockInfo blocktable[];
|
||||
extern const int blocktable_len;
|
||||
|
||||
DMAObject nv_dma_load(NV2AState *d, hwaddr dma_obj_address);
|
||||
void *nv_dma_map(NV2AState *d, hwaddr dma_obj_address, hwaddr *len);
|
||||
void nv2a_init(PCIBus *bus, int devfn, MemoryRegion *ram);
|
||||
void pgraph_init(NV2AState *d);
|
||||
void *pfifo_puller_thread(void *opaque);
|
||||
void pgraph_destroy(PGRAPHState *pg);
|
||||
void update_irq(NV2AState *d);
|
||||
void pgraph_context_switch(NV2AState *d, unsigned int channel_id);
|
||||
void pgraph_wait_fifo_access(NV2AState *d);
|
||||
void pgraph_method(NV2AState *d,
|
||||
unsigned int subchannel,
|
||||
unsigned int method,
|
||||
uint32_t parameter);
|
||||
|
||||
#define DEFINE_PROTO(n) \
|
||||
uint64_t n##_read(void *opaque, hwaddr addr, unsigned int size); \
|
||||
void n##_write(void *opaque, hwaddr addr, uint64_t val, unsigned int size);
|
||||
|
||||
DEFINE_PROTO(pmc)
|
||||
DEFINE_PROTO(pbus)
|
||||
DEFINE_PROTO(pfifo)
|
||||
DEFINE_PROTO(prma)
|
||||
DEFINE_PROTO(pvideo)
|
||||
DEFINE_PROTO(ptimer)
|
||||
DEFINE_PROTO(pcounter)
|
||||
DEFINE_PROTO(pvpe)
|
||||
DEFINE_PROTO(ptv)
|
||||
DEFINE_PROTO(prmfb)
|
||||
DEFINE_PROTO(prmvio)
|
||||
DEFINE_PROTO(pfb)
|
||||
DEFINE_PROTO(pstraps)
|
||||
DEFINE_PROTO(pgraph)
|
||||
DEFINE_PROTO(pcrtc)
|
||||
DEFINE_PROTO(prmcio)
|
||||
DEFINE_PROTO(pramdac)
|
||||
DEFINE_PROTO(prmdio)
|
||||
// DEFINE_PROTO(pramin)
|
||||
DEFINE_PROTO(user)
|
||||
|
||||
#undef DEFINE_PROTO
|
||||
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -261,12 +261,7 @@ static const SurfaceColorFormatInfo kelvin_surface_color_format_map[] = {
|
|||
{4, GL_RGBA8, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV},
|
||||
};
|
||||
|
||||
uint64_t pgraph_read(void *opaque, hwaddr addr, unsigned int size);
|
||||
void pgraph_write(void *opaque, hwaddr addr, uint64_t val, unsigned int size);
|
||||
|
||||
static void pgraph_context_switch(NV2AState *d, unsigned int channel_id);
|
||||
static void pgraph_set_context_user(NV2AState *d, uint32_t val);
|
||||
static void pgraph_wait_fifo_access(NV2AState *d);
|
||||
static void pgraph_method_log(unsigned int subchannel, unsigned int graphics_class, unsigned int method, uint32_t parameter);
|
||||
static void pgraph_allocate_inline_buffer_vertices(PGRAPHState *pg, unsigned int attr);
|
||||
static void pgraph_finish_inline_buffer_vertex(PGRAPHState *pg);
|
||||
|
|
@ -440,7 +435,7 @@ void pgraph_write(void *opaque, hwaddr addr, uint64_t val, unsigned int size)
|
|||
qemu_mutex_unlock(&d->pgraph.lock);
|
||||
}
|
||||
|
||||
static void pgraph_method(NV2AState *d,
|
||||
void pgraph_method(NV2AState *d,
|
||||
unsigned int subchannel,
|
||||
unsigned int method,
|
||||
uint32_t parameter)
|
||||
|
|
@ -2516,7 +2511,7 @@ static void pgraph_method(NV2AState *d,
|
|||
}
|
||||
|
||||
|
||||
static void pgraph_context_switch(NV2AState *d, unsigned int channel_id)
|
||||
void pgraph_context_switch(NV2AState *d, unsigned int channel_id)
|
||||
{
|
||||
bool valid;
|
||||
valid = d->pgraph.channel_valid && d->pgraph.channel_id == channel_id;
|
||||
|
|
@ -2540,7 +2535,7 @@ static void pgraph_context_switch(NV2AState *d, unsigned int channel_id)
|
|||
}
|
||||
}
|
||||
|
||||
static void pgraph_wait_fifo_access(NV2AState *d) {
|
||||
void pgraph_wait_fifo_access(NV2AState *d) {
|
||||
while (!d->pgraph.fifo_access) {
|
||||
qemu_cond_wait(&d->pgraph.fifo_access_cond, &d->pgraph.lock);
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue