From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1KLgA1-0001Hr-MK for qemu-devel@nongnu.org; Wed, 23 Jul 2008 11:21:49 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1KLgA1-0001HX-5A for qemu-devel@nongnu.org; Wed, 23 Jul 2008 11:21:49 -0400 Received: from [199.232.76.173] (port=33252 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1KLgA0-0001HS-Us for qemu-devel@nongnu.org; Wed, 23 Jul 2008 11:21:49 -0400 Received: from yx-out-1718.google.com ([74.125.44.152]:60175) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1KLgA0-0002xN-F4 for qemu-devel@nongnu.org; Wed, 23 Jul 2008 11:21:48 -0400 Received: by yx-out-1718.google.com with SMTP id 3so427420yxi.82 for ; Wed, 23 Jul 2008 08:21:47 -0700 (PDT) Message-ID: <48874C6B.5080807@codemonkey.ws> Date: Wed, 23 Jul 2008 10:21:15 -0500 From: Anthony Liguori MIME-Version: 1.0 Subject: Re: [Qemu-devel] [PATCH] Save 3MB ioport table memory References: <20080721120211.GD4501@implementation.uk.xensource.com> <48868EDB.7010809@codemonkey.ws> <20080723105821.GB4454@implementation.uk.xensource.com> <200807231315.43892.paul@codesourcery.com> <20080723123904.GI4454@implementation.uk.xensource.com> In-Reply-To: <20080723123904.GI4454@implementation.uk.xensource.com> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 8bit Reply-To: qemu-devel@nongnu.org List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Samuel Thibault Cc: Paul Brook , qemu-devel@nongnu.org Samuel Thibault wrote: > Save 1.5MB (32bit) or 3MB (64bit) memory by keeping ioport tables > sparse and use a test against NULL instead. > > Signed-off-by: Samuel Thibault > Applied. Thanks. In the future, please make your patches apply with -p1 and resubmit patches as a top-level post with an indication of the patch version (v3). It's easy to miss a patch that's deep within a thread. Regards, Anthony Liguori > Index: vl.c > =================================================================== > --- vl.c (révision 4924) > +++ vl.c (copie de travail) > @@ -260,6 +260,35 @@ > target_phys_addr_t isa_mem_base = 0; > PicState2 *isa_pic; > > +static IOPortReadFunc default_ioport_readb, default_ioport_readw, default_ioport_readl; > +static IOPortWriteFunc default_ioport_writeb, default_ioport_writew, default_ioport_writel; > + > +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); > +} > + > +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); > +} > + > static uint32_t default_ioport_readb(void *opaque, uint32_t address) > { > #ifdef DEBUG_UNUSED_IOPORT > @@ -279,17 +308,17 @@ > static uint32_t default_ioport_readw(void *opaque, uint32_t address) > { > uint32_t data; > - data = ioport_read_table[0][address](ioport_opaque[address], address); > + data = ioport_read(0, address); > address = (address + 1) & (MAX_IOPORTS - 1); > - data |= ioport_read_table[0][address](ioport_opaque[address], address) << 8; > + data |= ioport_read(0, address) << 8; > return data; > } > > static void default_ioport_writew(void *opaque, uint32_t address, uint32_t data) > { > - ioport_write_table[0][address](ioport_opaque[address], address, data & 0xff); > + ioport_write(0, address, data & 0xff); > address = (address + 1) & (MAX_IOPORTS - 1); > - ioport_write_table[0][address](ioport_opaque[address], address, (data >> 8) & 0xff); > + ioport_write(0, address, (data >> 8) & 0xff); > } > > static uint32_t default_ioport_readl(void *opaque, uint32_t address) > @@ -307,20 +336,6 @@ > #endif > } > > -static void init_ioports(void) > -{ > - int i; > - > - for(i = 0; i < MAX_IOPORTS; i++) { > - ioport_read_table[0][i] = default_ioport_readb; > - ioport_write_table[0][i] = default_ioport_writeb; > - ioport_read_table[1][i] = default_ioport_readw; > - ioport_write_table[1][i] = default_ioport_writew; > - ioport_read_table[2][i] = default_ioport_readl; > - ioport_write_table[2][i] = default_ioport_writel; > - } > -} > - > /* size is the word size in byte */ > int register_ioport_read(int start, int length, int size, > IOPortReadFunc *func, void *opaque) > @@ -394,7 +409,7 @@ > if (loglevel & CPU_LOG_IOPORT) > fprintf(logfile, "outb: %04x %02x\n", addr, val); > #endif > - ioport_write_table[0][addr](ioport_opaque[addr], addr, val); > + ioport_write(0, addr, val); > #ifdef USE_KQEMU > if (env) > env->last_io_time = cpu_get_time_fast(); > @@ -407,7 +422,7 @@ > if (loglevel & CPU_LOG_IOPORT) > fprintf(logfile, "outw: %04x %04x\n", addr, val); > #endif > - ioport_write_table[1][addr](ioport_opaque[addr], addr, val); > + ioport_write(1, addr, val); > #ifdef USE_KQEMU > if (env) > env->last_io_time = cpu_get_time_fast(); > @@ -420,7 +435,7 @@ > if (loglevel & CPU_LOG_IOPORT) > fprintf(logfile, "outl: %04x %08x\n", addr, val); > #endif > - ioport_write_table[2][addr](ioport_opaque[addr], addr, val); > + ioport_write(2, addr, val); > #ifdef USE_KQEMU > if (env) > env->last_io_time = cpu_get_time_fast(); > @@ -430,7 +445,7 @@ > int cpu_inb(CPUState *env, int addr) > { > int val; > - val = ioport_read_table[0][addr](ioport_opaque[addr], addr); > + val = ioport_read(0, addr); > #ifdef DEBUG_IOPORT > if (loglevel & CPU_LOG_IOPORT) > fprintf(logfile, "inb : %04x %02x\n", addr, val); > @@ -445,7 +460,7 @@ > int cpu_inw(CPUState *env, int addr) > { > int val; > - val = ioport_read_table[1][addr](ioport_opaque[addr], addr); > + val = ioport_read(1, addr); > #ifdef DEBUG_IOPORT > if (loglevel & CPU_LOG_IOPORT) > fprintf(logfile, "inw : %04x %04x\n", addr, val); > @@ -460,7 +475,7 @@ > int cpu_inl(CPUState *env, int addr) > { > int val; > - val = ioport_read_table[2][addr](ioport_opaque[addr], addr); > + val = ioport_read(2, addr); > #ifdef DEBUG_IOPORT > if (loglevel & CPU_LOG_IOPORT) > fprintf(logfile, "inl : %04x %08x\n", addr, val); > @@ -8832,8 +8847,6 @@ > register_savevm("timer", 0, 2, timer_save, timer_load, NULL); > register_savevm("ram", 0, 2, ram_save, ram_load, NULL); > > - init_ioports(); > - > /* terminal init */ > memset(&display_state, 0, sizeof(display_state)); > if (nographic) { >