Two-Level IOPort Lookup
PATCH RESEND 1/1 Two-Level IOPort Lookup
I didn't get any more feedback, so either I'm being ignored, or its great :)
Signed-off-by Brian Wheeler <[email protected]>
vl.c +106 -38
@@ -168,8 +168,8 @@//#define DEBUG_IOPORT //#define DEBUG_NET //#define DEBUG_SLIRP +//#define DEBUG_IOPORT_FIND -#ifdef DEBUG_IOPORT # define LOG_IOPORT (...) qemu_log_mask(CPU_LOG_IOPORT, ## __VA_ARGS__)#else
@@ -184,14 +184,31 @@/* Max number of bluetooth switches on the commandline. */ #define MAX_BT_CMDLINE 10 -/* XXX: use a two level table to limit memory usage */ -#define MAX_IOPORTS 65536 -const char *bios_dir =CONFIG_QEMU_SHAREDIR ;const char *bios_name =NULL ; -static void *ioport_opaque[MAX_IOPORTS ]; -static IOPortReadFunc *ioport_read_table[3 ][MAX_IOPORTS ]; -static IOPortWriteFunc *ioport_write_table[3 ][MAX_IOPORTS ]; + +struct ioport { +void *opaque; +IOPortReadFunc *read[3 ]; +IOPortWriteFunc *write[3 ]; +void *pad; +}; +typedef struct ioport IOPort ; + +#ifdef TARGET_ALPHA +#define IOPORT_MAXBITS 24 +#define IOPORT_PAGEBITS 12 +#else +#define IOPORT_MAXBITS 16 +#define IOPORT_PAGEBITS 8 +#endif + +#define IOPORT_ENTRYMASK ((1<<IOPORT_PAGEBITS)-1) +#define IOPORT_PAGEMASK ~IOPORT_ENTRYMASK +#define MAX_IOPORTS (1<<IOPORT_MAXBITS) + +IOPort *IOPortable[1 <<(IOPORT_MAXBITS -IOPORT_PAGEBITS )]; +/* Note: drives_table[MAX_DRIVES] is a dummy block driver if none available to store the VM snapshots */ DriveInfo drives_table[MAX_DRIVES +1 ];
@@ -288,30 +305,78 @@static IOPortReadFunc default_ioport_readb, default_ioport_readw, default_ioport_readl;static IOPortWriteFunc default_ioport_writeb, default_ioport_writew, default_ioport_writel; + +static IOPort ioport_default_func = { +NULL , + {default_ioport_readb, default_ioport_readw, default_ioport_readl}, + {default_ioport_writeb, default_ioport_writew, default_ioport_writel}, +NULL +}; + +static inline IOPort *ioport_find (uint32_t address,int allocate) +{ +uint32_t page = (address &IOPORT_PAGEMASK ) >>IOPORT_PAGEBITS ; +uint32_t entry = address &IOPORT_ENTRYMASK ; +#ifdef DEBUG_IOPORT_FIND +static int page_count =0 ; +if (address >= (1 <<IOPORT_MAXBITS )) { +hw_error ("Maximum port # for this architecture is %d. " +"Port %d requested." , (1 <<IOPORT_MAXBITS )-1 , address); + } +#endif +if (IOPortable[page] ==NULL ) { +if (allocate) { + IOPortable[page]=qemu_mallocz ((1 <<IOPORT_PAGEBITS ) * +sizeof (IOPort)); +#ifdef DEBUG_IOPORT_FIND +printf ("Initializing ioport page %d to: %p (0x%lx bytes)\n" , + page, IOPortable[page], + (1 <<IOPORT_PAGEBITS )*sizeof (IOPort)); + page_count++; +#endif + }else { +return &ioport_default_func; + } + } +IOPort *p=&(IOPortable[page][entry]); + +#ifdef DEBUG_IOPORT_FIND +if (allocate) { +printf ("port find %d: page=%d, address=%p, entry=%d, address=%p, " +"offset=0x%lx\n" , address, page, IOPortable[page], + entry, p, p-IOPortable[page]); +printf (" data: %p\n" , p->opaque); +printf (" read: %p, %p, %p\n" , p->read[0 ], p->read[1 ], p->read[2 ]); +printf (" write: %p, %p, %p\n" , p->write[0 ], p->write[1 ], p->write[2 ]); + +printf (" --- %d pages allocated, %ld bytes used. --- \n" , + page_count, + page_count * (sizeof (IOPort) * (1 <<IOPORT_PAGEBITS ))); + } +#endif +return p; +} +static uint32_t ioport_read (int index,uint32_t address) { -static IOPortReadFunc *default_func[3 ] = { - default_ioport_readb, - default_ioport_readw, - default_ioport_readl - }; -IOPortReadFunc *func = ioport_read_table[index][address]; -if (!func) - func = default_func[index]; -return func (ioport_opaque[address], address); +IOPort *p =ioport_find (address,0 ); +IOPortReadFunc *func = p->read[index]; +void *opaque = p->opaque; +if (!func) { + func = ioport_default_func.read[index]; + } +return func (opaque, address); }static void ioport_write (int index,uint32_t address,uint32_t data) { -static IOPortWriteFunc *default_func[3 ] = { - default_ioport_writeb, - default_ioport_writew, - default_ioport_writel - }; -IOPortWriteFunc *func = ioport_write_table[index][address]; -if (!func) - func = default_func[index]; -func (ioport_opaque[address], address, data); +IOPort *p =ioport_find (address,0 ); +IOPortWriteFunc *func = p->write[index]; +void *opaque = p->opaque; +if (!func) { + func = ioport_default_func.write[index]; + } +func (opaque, address, data); }static uint32_t default_ioport_readb (void *opaque,uint32_t address)
@@ -378,10 +443,11 @@return -1 ; }for (i = start; i < start + length; i += size) { - ioport_read_table[bsize][i] = func; -if (ioport_opaque[i] !=NULL && ioport_opaque[i] != opaque) +IOPort *p =ioport_find (i,1 ); + p->read[bsize] = func; +if (p->opaque !=NULL && p->opaque != opaque)hw_error ("register_ioport_read: invalid opaque" ); - ioport_opaque[i] = opaque; + p->opaque = opaque; }return 0 ; }
@@ -403,10 +469,11 @@return -1 ; }for (i = start; i < start + length; i += size) { - ioport_write_table[bsize][i] = func; -if (ioport_opaque[i] !=NULL && ioport_opaque[i] != opaque) +IOPort *p =ioport_find (i,1 ); + p->write[bsize] = func; +if (p->opaque !=NULL && p->opaque != opaque)hw_error ("register_ioport_write: invalid opaque" ); - ioport_opaque[i] = opaque; + p->opaque = opaque; }return 0 ; }
@@ -416,15 +483,16 @@int i;for (i = start; i < start + length; i++) { - ioport_read_table[0 ][i] = default_ioport_readb; - ioport_read_table[1 ][i] = default_ioport_readw; - ioport_read_table[2 ][i] = default_ioport_readl; +IOPort *p =ioport_find (i,1 ); + p->read[0 ] = default_ioport_readb; + p->read[1 ] = default_ioport_readw; + p->read[2 ] = default_ioport_readl; - ioport_write_table[0 ][i] = default_ioport_writeb; - ioport_write_table[1 ][i] = default_ioport_writew; - ioport_write_table[2 ][i] = default_ioport_writel; + p->write[0 ] = default_ioport_writeb; + p->write[1 ] = default_ioport_writew; + p->write[2 ] = default_ioport_writel; - ioport_opaque[i] =NULL ; + p->opaque =NULL ; } }