From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1LGLk6-0007Ci-4D for qemu-devel@nongnu.org; Fri, 26 Dec 2008 18:05:18 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1LGLk5-0007C3-Fs for qemu-devel@nongnu.org; Fri, 26 Dec 2008 18:05:17 -0500 Received: from [199.232.76.173] (port=37624 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1LGLk5-0007Bt-DL for qemu-devel@nongnu.org; Fri, 26 Dec 2008 18:05:17 -0500 Received: from savannah.gnu.org ([199.232.41.3]:44733 helo=sv.gnu.org) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1LGLk5-0007Ts-02 for qemu-devel@nongnu.org; Fri, 26 Dec 2008 18:05:17 -0500 Received: from cvs.savannah.gnu.org ([199.232.41.69]) by sv.gnu.org with esmtp (Exim 4.63) (envelope-from ) id 1LGLk4-0005lY-Ir for qemu-devel@nongnu.org; Fri, 26 Dec 2008 23:05:16 +0000 Received: from aurel32 by cvs.savannah.gnu.org with local (Exim 4.63) (envelope-from ) id 1LGLk4-0005lT-Bl for qemu-devel@nongnu.org; Fri, 26 Dec 2008 23:05:16 +0000 MIME-Version: 1.0 Errors-To: aurel32 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit From: Aurelien Jarno Message-Id: Date: Fri, 26 Dec 2008 23:05:16 +0000 Subject: [Qemu-devel] [6132] target-ppc: fix PowerMAC NVRAM emulation Reply-To: qemu-devel@nongnu.org List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Revision: 6132 http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=6132 Author: aurel32 Date: 2008-12-26 23:05:15 +0000 (Fri, 26 Dec 2008) Log Message: ----------- target-ppc: fix PowerMAC NVRAM emulation Signed-off-by: Aurelien Jarno Modified Paths: -------------- trunk/hw/mac_nvram.c Modified: trunk/hw/mac_nvram.c =================================================================== --- trunk/hw/mac_nvram.c 2008-12-24 20:30:01 UTC (rev 6131) +++ trunk/hw/mac_nvram.c 2008-12-26 23:05:15 UTC (rev 6132) @@ -40,7 +40,7 @@ struct MacIONVRAMState { target_phys_addr_t size; int mem_index; - uint8_t data[0x2000]; + uint8_t *data; }; /* Direct access to NVRAM */ @@ -49,7 +49,7 @@ MacIONVRAMState *s = opaque; uint32_t ret; - if (addr < 0x2000) + if (addr < s->size) ret = s->data[addr]; else ret = -1; @@ -63,7 +63,7 @@ MacIONVRAMState *s = opaque; NVR_DPRINTF("write addr %04x val %x\n", addr, val); - if (addr < 0x2000) + if (addr < s->size) s->data[addr] = val; } @@ -73,7 +73,7 @@ { MacIONVRAMState *s = opaque; - addr = (addr >> 4) & 0x1fff; + addr = (addr >> 4) & (s->size - 1); s->data[addr] = value; NVR_DPRINTF("writeb addr %04x val %x\n", (int)addr, value); } @@ -83,7 +83,7 @@ MacIONVRAMState *s = opaque; uint32_t value; - addr = (addr >> 4) & 0x1fff; + addr = (addr >> 4) & (s->size - 1); value = s->data[addr]; NVR_DPRINTF("readb addr %04x val %x\n", (int)addr, value); @@ -109,7 +109,13 @@ s = qemu_mallocz(sizeof(MacIONVRAMState)); if (!s) return NULL; + s->data = qemu_mallocz(size); + if (!s->data) { + qemu_free(s); + return NULL; + } s->size = size; + s->mem_index = cpu_register_io_memory(0, nvram_read, nvram_write, s); *mem_index = s->mem_index; @@ -121,7 +127,7 @@ MacIONVRAMState *s; s = opaque; - cpu_register_physical_memory(mem_base, s->size, s->mem_index); + cpu_register_physical_memory(mem_base, s->size << 4, s->mem_index); } /* Set up a system OpenBIOS NVRAM partition */