Move PowerPC 405 specific definitions into a separate file

Preliminary code for -kernel option support for PowerPC 405 boards
Fix DBSR in case of PowerPC 405 chip reset
Add enums for PowerPC 405 clocks.
Fix IRQ numbers (IBM reversed bits numbering...)
Fix SPRG4-7 read access right
Fix MSR mask in CPU definitions


git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@2692 c046a42c-6fe2-441c-8c8c-71466251a162

4 files changed, 347 insertions, 204 deletions

diff --git a/hw/ppc405.h b/hw/ppc405.h
new file mode 100644
index 0000000000..e3a544dd17
--- /dev/null
+++ b/hw/ppc405.h
@@ -0,0 +1,117 @@
+/*
+ * QEMU PowerPC 405 shared definitions
+ * 
+ * Copyright (c) 2007 Jocelyn Mayer
+ * 
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#if !defined(PPC_405_H)
+#define PPC_405_H
+
+/* Bootinfo as set-up by u-boot */
+typedef struct ppc4xx_bd_info_t ppc4xx_bd_info_t;
+struct ppc4xx_bd_info_t {
+    uint32_t bi_memstart;
+    uint32_t bi_memsize;
+    uint32_t bi_flashstart;
+    uint32_t bi_flashsize;
+    uint32_t bi_flashoffset; /* 0x10 */
+    uint32_t bi_sramstart;
+    uint32_t bi_sramsize;
+    uint32_t bi_bootflags;
+    uint32_t bi_ipaddr; /* 0x20 */
+    uint8_t  bi_enetaddr[6];
+    uint16_t bi_ethspeed;
+    uint32_t bi_intfreq;
+    uint32_t bi_busfreq; /* 0x30 */
+    uint32_t bi_baudrate;
+    uint8_t  bi_s_version[4];
+    uint8_t  bi_r_version[32];
+    uint32_t bi_procfreq;
+    uint32_t bi_plb_busfreq;
+    uint32_t bi_pci_busfreq;
+    uint8_t  bi_pci_enetaddr[6];
+    uint32_t bi_pci_enetaddr2[6];
+    uint32_t bi_opbfreq;
+    uint32_t bi_iic_fast[2];
+};
+
+/* PowerPC 405 core */
+CPUState *ppc405_init (const unsigned char *cpu_model,
+                       clk_setup_t *cpu_clk, clk_setup_t *tb_clk,
+                       uint32_t sysclk);
+ram_addr_t ppc405_set_bootinfo (CPUState *env, ppc4xx_bd_info_t *bd);
+
+void ppc40x_core_reset (CPUState *env);
+void ppc40x_chip_reset (CPUState *env);
+void ppc40x_system_reset (CPUState *env);
+/* */
+typedef struct ppc4xx_mmio_t ppc4xx_mmio_t;
+int ppc4xx_mmio_register (CPUState *env, ppc4xx_mmio_t *mmio,
+                          uint32_t offset, uint32_t len,
+                          CPUReadMemoryFunc **mem_read,
+                          CPUWriteMemoryFunc **mem_write, void *opaque);
+ppc4xx_mmio_t *ppc4xx_mmio_init (CPUState *env, uint32_t base);
+/* PowerPC 4xx peripheral local bus arbitrer */
+void ppc4xx_plb_init (CPUState *env);
+/* PLB to OPB bridge */
+void ppc4xx_pob_init (CPUState *env);
+/* OPB arbitrer */
+void ppc4xx_opba_init (CPUState *env, ppc4xx_mmio_t *mmio, uint32_t offset);
+/* PowerPC 4xx universal interrupt controller */
+enum {
+    PPCUIC_OUTPUT_INT = 0,
+    PPCUIC_OUTPUT_CINT = 1,
+    PPCUIC_OUTPUT_NB,
+};
+qemu_irq *ppcuic_init (CPUState *env, qemu_irq *irqs,
+                       uint32_t dcr_base, int has_ssr, int has_vr);
+/* SDRAM controller */
+void ppc405_sdram_init (CPUState *env, qemu_irq irq, int nbanks,
+                        target_ulong *ram_bases, target_ulong *ram_sizes,
+                        int do_init);
+/* Peripheral controller */
+void ppc405_ebc_init (CPUState *env);
+/* DMA controller */
+void ppc405_dma_init (CPUState *env, qemu_irq irqs[4]);
+/* GPIO */
+void ppc405_gpio_init (CPUState *env, ppc4xx_mmio_t *mmio, uint32_t offset);
+/* Serial ports */
+void ppc405_serial_init (CPUState *env, ppc4xx_mmio_t *mmio,
+                         uint32_t offset, qemu_irq irq,
+                         CharDriverState *chr);
+/* On Chip Memory */
+void ppc405_ocm_init (CPUState *env, unsigned long offset);
+/* I2C controller */
+void ppc405_i2c_init (CPUState *env, ppc4xx_mmio_t *mmio, uint32_t offset);
+/* PowerPC 405 microcontrollers */
+CPUState *ppc405cr_init (target_ulong ram_bases[4], target_ulong ram_sizes[4],
+                         uint32_t sysclk, qemu_irq **picp,
+                         ram_addr_t *offsetp, int do_init);
+CPUState *ppc405ep_init (target_ulong ram_bases[2], target_ulong ram_sizes[2],
+                         uint32_t sysclk, qemu_irq **picp,
+                         ram_addr_t *offsetp, int do_init);
+/* IBM STBxxx microcontrollers */
+CPUState *ppc_stb025_init (target_ulong ram_bases[2],
+                           target_ulong ram_sizes[2],
+                           uint32_t sysclk, qemu_irq **picp,
+                           ram_addr_t *offsetp);
+
+#endif /* !defined(PPC_405_H) */
diff --git a/hw/ppc405_uc.c b/hw/ppc405_uc.c
index 0b7ef12733..f5c1c31bd2 100644
--- a/hw/ppc405_uc.c
+++ b/hw/ppc405_uc.c
@@ -22,6 +22,7 @@
  * THE SOFTWARE.
  */
 #include "vl.h"
+#include "ppc405.h"
 
 extern int loglevel;
 extern FILE *logfile;
@@ -66,6 +67,51 @@ CPUState *ppc405_init (const unsigned char *cpu_model,
     return env;
 }
 
+ram_addr_t ppc405_set_bootinfo (CPUState *env, ppc4xx_bd_info_t *bd)
+{
+    ram_addr_t bdloc;
+    int i, n;
+
+    /* We put the bd structure at the top of memory */
+    bdloc = bd->bi_memsize - sizeof(struct ppc4xx_bd_info_t);
+    stl_raw(phys_ram_base + bdloc + 0x00, bd->bi_memstart);
+    stl_raw(phys_ram_base + bdloc + 0x04, bd->bi_memsize);
+    stl_raw(phys_ram_base + bdloc + 0x08, bd->bi_flashstart);
+    stl_raw(phys_ram_base + bdloc + 0x0C, bd->bi_flashsize);
+    stl_raw(phys_ram_base + bdloc + 0x10, bd->bi_flashoffset);
+    stl_raw(phys_ram_base + bdloc + 0x14, bd->bi_sramstart);
+    stl_raw(phys_ram_base + bdloc + 0x18, bd->bi_sramsize);
+    stl_raw(phys_ram_base + bdloc + 0x1C, bd->bi_bootflags);
+    stl_raw(phys_ram_base + bdloc + 0x20, bd->bi_ipaddr);
+    for (i = 0; i < 6; i++)
+        stb_raw(phys_ram_base + bdloc + 0x24 + i, bd->bi_enetaddr[i]);
+    stw_raw(phys_ram_base + bdloc + 0x2A, bd->bi_ethspeed);
+    stl_raw(phys_ram_base + bdloc + 0x2C, bd->bi_intfreq);
+    stl_raw(phys_ram_base + bdloc + 0x30, bd->bi_busfreq);
+    stl_raw(phys_ram_base + bdloc + 0x34, bd->bi_baudrate);
+    for (i = 0; i < 4; i++)
+        stb_raw(phys_ram_base + bdloc + 0x38 + i, bd->bi_s_version[i]);
+    for (i = 0; i < 32; i++)
+        stb_raw(phys_ram_base + bdloc + 0x3C + i, bd->bi_s_version[i]);
+    stl_raw(phys_ram_base + bdloc + 0x5C, bd->bi_plb_busfreq);
+    stl_raw(phys_ram_base + bdloc + 0x60, bd->bi_pci_busfreq);
+    for (i = 0; i < 6; i++)
+        stb_raw(phys_ram_base + bdloc + 0x64 + i, bd->bi_pci_enetaddr[i]);
+    n = 0x6A;
+    if (env->spr[SPR_PVR] == CPU_PPC_405EP) {
+        for (i = 0; i < 6; i++)
+            stb_raw(phys_ram_base + bdloc + n++, bd->bi_pci_enetaddr2[i]);
+    }
+    stl_raw(phys_ram_base + bdloc + n, bd->bi_opbfreq);
+    n += 4;
+    for (i = 0; i < 2; i++) {
+        stl_raw(phys_ram_base + bdloc + n, bd->bi_iic_fast[i]);
+        n += 4;
+    }
+
+    return bdloc;
+}
+
 /*****************************************************************************/
 /* Shared peripherals */
 
@@ -960,6 +1006,10 @@ static void sdram_unmap_bcr (ppc4xx_sdram_t *sdram)
     int i;
 
     for (i = 0; i < sdram->nbanks; i++) {
+#ifdef DEBUG_SDRAM
+        printf("%s: Unmap RAM area " ADDRX " " ADDRX "\n", __func__,
+               sdram_base(sdram->bcr[i]), sdram_size(sdram->bcr[i]));
+#endif
         cpu_register_physical_memory(sdram_base(sdram->bcr[i]),
                                      sdram_size(sdram->bcr[i]),
                                      IO_MEM_UNASSIGNED);
@@ -1141,7 +1191,8 @@ static void sdram_reset (void *opaque)
 }
 
 void ppc405_sdram_init (CPUState *env, qemu_irq irq, int nbanks,
-                        target_ulong *ram_bases, target_ulong *ram_sizes)
+                        target_ulong *ram_bases, target_ulong *ram_sizes,
+                        int do_init)
 {
     ppc4xx_sdram_t *sdram;
 
@@ -1159,6 +1210,8 @@ void ppc405_sdram_init (CPUState *env, qemu_irq irq, int nbanks,
                          sdram, &dcr_read_sdram, &dcr_write_sdram);
         ppc_dcr_register(env, SDRAM0_CFGDATA,
                          sdram, &dcr_read_sdram, &dcr_write_sdram);
+        if (do_init)
+            sdram_map_bcr(sdram);
     }
 }
 
@@ -2079,7 +2132,7 @@ void ppc40x_chip_reset (CPUState *env)
     /* XXX: TODO reset all internal peripherals */
     dbsr = env->spr[SPR_40x_DBSR];
     dbsr &= ~0x00000300;
-    dbsr |= 0x00000100;
+    dbsr |= 0x00000200;
     env->spr[SPR_40x_DBSR] = dbsr;
     cpu_loop_exit();
 }
@@ -2124,9 +2177,20 @@ enum {
     PPC405CR_CPC0_SR     = 0x0BB,
 };
 
+enum {
+    PPC405CR_CPU_CLK   = 0,
+    PPC405CR_TMR_CLK   = 1,
+    PPC405CR_PLB_CLK   = 2,
+    PPC405CR_SDRAM_CLK = 3,
+    PPC405CR_OPB_CLK   = 4,
+    PPC405CR_EXT_CLK   = 5,
+    PPC405CR_UART_CLK  = 6,
+    PPC405CR_CLK_NB    = 7,
+};
+
 typedef struct ppc405cr_cpc_t ppc405cr_cpc_t;
 struct ppc405cr_cpc_t {
-    clk_setup_t clk_setup[7];
+    clk_setup_t clk_setup[PPC405CR_CLK_NB];
     uint32_t sysclk;
     uint32_t psr;
     uint32_t cr0;
@@ -2175,19 +2239,19 @@ static void ppc405cr_clk_setup (ppc405cr_cpc_t *cpc)
     D0 = ((cpc->cr0 >> 1) & 0x1F) + 1;
     UART_clk = CPU_clk / D0;
     /* Setup CPU clocks */
-    clk_setup(&cpc->clk_setup[0], CPU_clk);
+    clk_setup(&cpc->clk_setup[PPC405CR_CPU_CLK], CPU_clk);
     /* Setup time-base clock */
-    clk_setup(&cpc->clk_setup[1], TMR_clk);
+    clk_setup(&cpc->clk_setup[PPC405CR_TMR_CLK], TMR_clk);
     /* Setup PLB clock */
-    clk_setup(&cpc->clk_setup[2], PLB_clk);
+    clk_setup(&cpc->clk_setup[PPC405CR_PLB_CLK], PLB_clk);
     /* Setup SDRAM clock */
-    clk_setup(&cpc->clk_setup[3], SDRAM_clk);
+    clk_setup(&cpc->clk_setup[PPC405CR_SDRAM_CLK], SDRAM_clk);
     /* Setup OPB clock */
-    clk_setup(&cpc->clk_setup[4], OPB_clk);
+    clk_setup(&cpc->clk_setup[PPC405CR_OPB_CLK], OPB_clk);
     /* Setup external clock */
-    clk_setup(&cpc->clk_setup[5], EXT_clk);
+    clk_setup(&cpc->clk_setup[PPC405CR_EXT_CLK], EXT_clk);
     /* Setup UART clock */
-    clk_setup(&cpc->clk_setup[6], UART_clk);
+    clk_setup(&cpc->clk_setup[PPC405CR_UART_CLK], UART_clk);
 }
 
 static target_ulong dcr_read_crcpc (void *opaque, int dcrn)
@@ -2357,7 +2421,8 @@ static void ppc405cr_cpc_init (CPUState *env, clk_setup_t clk_setup[7],
 
     cpc = qemu_mallocz(sizeof(ppc405cr_cpc_t));
     if (cpc != NULL) {
-        memcpy(cpc->clk_setup, clk_setup, 7 * sizeof(clk_setup_t));
+        memcpy(cpc->clk_setup, clk_setup,
+               PPC405CR_CLK_NB * sizeof(clk_setup_t));
         cpc->sysclk = sysclk;
         cpc->jtagid = 0x42051049;
         ppc_dcr_register(env, PPC405CR_CPC0_PSR, cpc,
@@ -2384,9 +2449,9 @@ static void ppc405cr_cpc_init (CPUState *env, clk_setup_t clk_setup[7],
 
 CPUState *ppc405cr_init (target_ulong ram_bases[4], target_ulong ram_sizes[4],
                          uint32_t sysclk, qemu_irq **picp,
-                         ram_addr_t *offsetp)
+                         ram_addr_t *offsetp, int do_init)
 {
-    clk_setup_t clk_setup[7];
+    clk_setup_t clk_setup[PPC405CR_CLK_NB];
     qemu_irq dma_irqs[4];
     CPUState *env;
     ppc4xx_mmio_t *mmio;
@@ -2395,7 +2460,8 @@ CPUState *ppc405cr_init (target_ulong ram_bases[4], target_ulong ram_sizes[4],
     int i;
 
     memset(clk_setup, 0, sizeof(clk_setup));
-    env = ppc405_init("405cr", &clk_setup[0], &clk_setup[1], sysclk);
+    env = ppc405_init("405cr", &clk_setup[PPC405CR_CPU_CLK],
+                      &clk_setup[PPC405CR_TMR_CLK], sysclk);
     /* Memory mapped devices registers */
     mmio = ppc4xx_mmio_init(env, 0xEF600000);
     /* PLB arbitrer */
@@ -2413,24 +2479,24 @@ CPUState *ppc405cr_init (target_ulong ram_bases[4], target_ulong ram_sizes[4],
     pic = ppcuic_init(env, irqs, 0x0C0, 0, 1);
     *picp = pic;
     /* SDRAM controller */
-    ppc405_sdram_init(env, pic[17], 1, ram_bases, ram_sizes);
+    ppc405_sdram_init(env, pic[14], 1, ram_bases, ram_sizes, do_init);
     offset = 0;
     for (i = 0; i < 4; i++)
         offset += ram_sizes[i];
     /* External bus controller */
     ppc405_ebc_init(env);
     /* DMA controller */
-    dma_irqs[0] = pic[5];
-    dma_irqs[1] = pic[6];
-    dma_irqs[2] = pic[7];
-    dma_irqs[3] = pic[8];
+    dma_irqs[0] = pic[26];
+    dma_irqs[1] = pic[25];
+    dma_irqs[2] = pic[24];
+    dma_irqs[3] = pic[23];
     ppc405_dma_init(env, dma_irqs);
     /* Serial ports */
     if (serial_hds[0] != NULL) {
-        ppc405_serial_init(env, mmio, 0x400, pic[0], serial_hds[0]);
+        ppc405_serial_init(env, mmio, 0x300, pic[31], serial_hds[0]);
     }
     if (serial_hds[1] != NULL) {
-        ppc405_serial_init(env, mmio, 0x300, pic[1], serial_hds[1]);
+        ppc405_serial_init(env, mmio, 0x400, pic[30], serial_hds[1]);
     }
     /* IIC controller */
     ppc405_i2c_init(env, mmio, 0x500);
@@ -2457,10 +2523,22 @@ enum {
     PPC405EP_CPC0_PCI    = 0x0F9,
 };
 
+enum {
+    PPC405EP_CPU_CLK   = 0,
+    PPC405EP_PLB_CLK   = 1,
+    PPC405EP_OPB_CLK   = 2,
+    PPC405EP_EBC_CLK   = 3,
+    PPC405EP_MAL_CLK   = 4,
+    PPC405EP_PCI_CLK   = 5,
+    PPC405EP_UART0_CLK = 6,
+    PPC405EP_UART1_CLK = 7,
+    PPC405EP_CLK_NB    = 8,
+};
+
 typedef struct ppc405ep_cpc_t ppc405ep_cpc_t;
 struct ppc405ep_cpc_t {
     uint32_t sysclk;
-    clk_setup_t clk_setup[8];
+    clk_setup_t clk_setup[PPC405EP_CLK_NB];
     uint32_t boot;
     uint32_t epctl;
     uint32_t pllmr[2];
@@ -2548,21 +2626,21 @@ static void ppc405ep_compute_clocks (ppc405ep_cpc_t *cpc)
            UART0_clk, UART1_clk);
 #endif
     /* Setup CPU clocks */
-    clk_setup(&cpc->clk_setup[0], CPU_clk);
+    clk_setup(&cpc->clk_setup[PPC405EP_CPU_CLK], CPU_clk);
     /* Setup PLB clock */
-    clk_setup(&cpc->clk_setup[1], PLB_clk);
+    clk_setup(&cpc->clk_setup[PPC405EP_PLB_CLK], PLB_clk);
     /* Setup OPB clock */
-    clk_setup(&cpc->clk_setup[2], OPB_clk);
+    clk_setup(&cpc->clk_setup[PPC405EP_OPB_CLK], OPB_clk);
     /* Setup external clock */
-    clk_setup(&cpc->clk_setup[3], EBC_clk);
+    clk_setup(&cpc->clk_setup[PPC405EP_EBC_CLK], EBC_clk);
     /* Setup MAL clock */
-    clk_setup(&cpc->clk_setup[4], MAL_clk);
+    clk_setup(&cpc->clk_setup[PPC405EP_MAL_CLK], MAL_clk);
     /* Setup PCI clock */
-    clk_setup(&cpc->clk_setup[5], PCI_clk);
+    clk_setup(&cpc->clk_setup[PPC405EP_PCI_CLK], PCI_clk);
     /* Setup UART0 clock */
-    clk_setup(&cpc->clk_setup[6], UART0_clk);
+    clk_setup(&cpc->clk_setup[PPC405EP_UART0_CLK], UART0_clk);
     /* Setup UART1 clock */
-    clk_setup(&cpc->clk_setup[7], UART0_clk);
+    clk_setup(&cpc->clk_setup[PPC405EP_UART1_CLK], UART1_clk);
 }
 
 static target_ulong dcr_read_epcpc (void *opaque, int dcrn)
@@ -2664,7 +2742,8 @@ static void ppc405ep_cpc_init (CPUState *env, clk_setup_t clk_setup[8],
 
     cpc = qemu_mallocz(sizeof(ppc405ep_cpc_t));
     if (cpc != NULL) {
-        memcpy(cpc->clk_setup, clk_setup, 7 * sizeof(clk_setup_t));
+        memcpy(cpc->clk_setup, clk_setup,
+               PPC405EP_CLK_NB * sizeof(clk_setup_t));
         cpc->jtagid = 0x20267049;
         cpc->sysclk = sysclk;
         ppc405ep_cpc_reset(cpc);
@@ -2690,9 +2769,9 @@ static void ppc405ep_cpc_init (CPUState *env, clk_setup_t clk_setup[8],
 
 CPUState *ppc405ep_init (target_ulong ram_bases[2], target_ulong ram_sizes[2],
                          uint32_t sysclk, qemu_irq **picp,
-                         ram_addr_t *offsetp)
+                         ram_addr_t *offsetp, int do_init)
 {
-    clk_setup_t clk_setup[8];
+    clk_setup_t clk_setup[PPC405EP_CLK_NB];
     qemu_irq dma_irqs[4];
     CPUState *env;
     ppc4xx_mmio_t *mmio;
@@ -2702,7 +2781,8 @@ CPUState *ppc405ep_init (target_ulong ram_bases[2], target_ulong ram_sizes[2],
 
     memset(clk_setup, 0, sizeof(clk_setup));
     /* init CPUs */
-    env = ppc405_init("405ep", &clk_setup[0], &clk_setup[1], sysclk);
+    env = ppc405_init("405ep", &clk_setup[PPC405EP_CPU_CLK],
+                      &clk_setup[PPC405EP_PLB_CLK], sysclk);
     /* Internal devices init */
     /* Memory mapped devices registers */
     mmio = ppc4xx_mmio_init(env, 0xEF600000);
@@ -2721,17 +2801,17 @@ CPUState *ppc405ep_init (target_ulong ram_bases[2], target_ulong ram_sizes[2],
     pic = ppcuic_init(env, irqs, 0x0C0, 0, 1);
     *picp = pic;
     /* SDRAM controller */
-    ppc405_sdram_init(env, pic[17], 2, ram_bases, ram_sizes);
+    ppc405_sdram_init(env, pic[14], 2, ram_bases, ram_sizes, do_init);
     offset = 0;
     for (i = 0; i < 2; i++)
         offset += ram_sizes[i];
     /* External bus controller */
     ppc405_ebc_init(env);
     /* DMA controller */
-    dma_irqs[0] = pic[5];
-    dma_irqs[1] = pic[6];
-    dma_irqs[2] = pic[7];
-    dma_irqs[3] = pic[8];
+    dma_irqs[0] = pic[26];
+    dma_irqs[1] = pic[25];
+    dma_irqs[2] = pic[24];
+    dma_irqs[3] = pic[23];
     ppc405_dma_init(env, dma_irqs);
     /* IIC controller */
     ppc405_i2c_init(env, mmio, 0x500);
@@ -2739,10 +2819,10 @@ CPUState *ppc405ep_init (target_ulong ram_bases[2], target_ulong ram_sizes[2],
     ppc405_gpio_init(env, mmio, 0x700);
     /* Serial ports */
     if (serial_hds[0] != NULL) {
-        ppc405_serial_init(env, mmio, 0x300, pic[0], serial_hds[0]);
+        ppc405_serial_init(env, mmio, 0x300, pic[31], serial_hds[0]);
     }
     if (serial_hds[1] != NULL) {
-        ppc405_serial_init(env, mmio, 0x400, pic[1], serial_hds[1]);
+        ppc405_serial_init(env, mmio, 0x400, pic[30], serial_hds[1]);
     }
     /* OCM */
     ppc405_ocm_init(env, ram_sizes[0] + ram_sizes[1]);
diff --git a/target-ppc/translate_init.c b/target-ppc/translate_init.c
index cb40dfbdde..0868f308cf 100644
--- a/target-ppc/translate_init.c
+++ b/target-ppc/translate_init.c
@@ -53,25 +53,27 @@ PPC_IRQ_INIT_FN(970);
 /* Generic callbacks:
  * do nothing but store/retrieve spr value
  */
+#ifdef PPC_DUMP_SPR_ACCESSES
 static void spr_read_generic (void *opaque, int sprn)
 {
-    gen_op_load_spr(sprn);
+    gen_op_load_dump_spr(sprn);
 }
 
 static void spr_write_generic (void *opaque, int sprn)
 {
-    gen_op_store_spr(sprn);
+    gen_op_store_dump_spr(sprn);
 }
-
-static void spr_read_dump (void *opaque, int sprn)
+#else
+static void spr_read_generic (void *opaque, int sprn)
 {
-    gen_op_load_dump_spr(sprn);
+    gen_op_load_spr(sprn);
 }
 
-static void spr_write_dump (void *opaque, int sprn)
+static void spr_write_generic (void *opaque, int sprn)
 {
-    gen_op_store_dump_spr(sprn);
+    gen_op_store_spr(sprn);
 }
+#endif
 
 #if !defined(CONFIG_USER_ONLY)
 static void spr_write_clear (void *opaque, int sprn)
@@ -1730,7 +1732,7 @@ static void gen_spr_405 (CPUPPCState *env)
                  0x00000000);
     spr_register(env, SPR_SPRG4, "SPRG4",
                  SPR_NOACCESS, SPR_NOACCESS,
-                 SPR_NOACCESS, &spr_write_generic,
+                 &spr_read_generic, &spr_write_generic,
                  0x00000000);
     spr_register(env, SPR_USPRG4, "USPRG4",
                  &spr_read_ureg, SPR_NOACCESS,
@@ -1738,7 +1740,7 @@ static void gen_spr_405 (CPUPPCState *env)
                  0x00000000);
     spr_register(env, SPR_SPRG5, "SPRG5",
                  SPR_NOACCESS, SPR_NOACCESS,
-                 SPR_NOACCESS, &spr_write_generic,
+                 spr_read_generic, &spr_write_generic,
                  0x00000000);
     spr_register(env, SPR_USPRG5, "USPRG5",
                  &spr_read_ureg, SPR_NOACCESS,
@@ -1746,7 +1748,7 @@ static void gen_spr_405 (CPUPPCState *env)
                  0x00000000);
     spr_register(env, SPR_SPRG6, "SPRG6",
                  SPR_NOACCESS, SPR_NOACCESS,
-                 SPR_NOACCESS, &spr_write_generic,
+                 spr_read_generic, &spr_write_generic,
                  0x00000000);
     spr_register(env, SPR_USPRG6, "USPRG6",
                  &spr_read_ureg, SPR_NOACCESS,
@@ -1754,7 +1756,7 @@ static void gen_spr_405 (CPUPPCState *env)
                  0x00000000);
     spr_register(env, SPR_SPRG7, "SPRG7",
                  SPR_NOACCESS, SPR_NOACCESS,
-                 SPR_NOACCESS, &spr_write_generic,
+                 spr_read_generic, &spr_write_generic,
                  0x00000000);
     spr_register(env, SPR_USPRG7, "USPRG7",
                  &spr_read_ureg, SPR_NOACCESS,
@@ -2756,7 +2758,7 @@ static ppc_def_t ppc_defs[] = {
         .pvr_mask    = 0xFFFFFF00,
         .insns_flags = PPC_INSNS_403,
         .flags       = PPC_FLAGS_403,
-        .msr_mask    = 0x000000000007D23D,
+        .msr_mask    = 0x000000000007D23DULL,
     },
 #endif
 #if defined (TODO)
@@ -2767,7 +2769,7 @@ static ppc_def_t ppc_defs[] = {
         .pvr_mask    = 0xFFFFFF00,
         .insns_flags = PPC_INSNS_403,
         .flags       = PPC_FLAGS_403,
-        .msr_mask    = 0x000000000007D23D,
+        .msr_mask    = 0x000000000007D23DULL,
     },
 #endif
 #if defined (TODO)
@@ -2778,7 +2780,7 @@ static ppc_def_t ppc_defs[] = {
         .pvr_mask    = 0xFFFFFF00,
         .insns_flags = PPC_INSNS_403,
         .flags       = PPC_FLAGS_403,
-        .msr_mask    = 0x000000000007D23D,
+        .msr_mask    = 0x000000000007D23DULL,
     },
 #endif
 #if defined (TODO)
@@ -2789,7 +2791,7 @@ static ppc_def_t ppc_defs[] = {
         .pvr_mask    = 0xFFFFFF00,
         .insns_flags = PPC_INSNS_403,
         .flags       = PPC_FLAGS_403,
-        .msr_mask    = 0x000000000007D23D,
+        .msr_mask    = 0x000000000007D23DULL,
     },
 #endif
 #if defined (TODO)
@@ -2800,7 +2802,7 @@ static ppc_def_t ppc_defs[] = {
         .pvr_mask    = 0xFFFFFF00,
         .insns_flags = PPC_INSNS_403,
         .flags       = PPC_FLAGS_403,
-        .msr_mask    = 0x000000000007D23D,
+        .msr_mask    = 0x000000000007D23DULL,
     },
 #endif
     /* Generic PowerPC 405 */
@@ -2810,7 +2812,7 @@ static ppc_def_t ppc_defs[] = {
         .pvr_mask    = 0xFFFF0000,
         .insns_flags = PPC_INSNS_405,
         .flags       = PPC_FLAGS_405,
-        .msr_mask    = 0x00000000020EFF30,
+        .msr_mask    = 0x00000000020EFF30ULL,
     },
     /* PowerPC 405 CR */
     {
@@ -2819,7 +2821,7 @@ static ppc_def_t ppc_defs[] = {
         .pvr_mask    = 0xFFFFFFFF,
         .insns_flags = PPC_INSNS_405,
         .flags       = PPC_FLAGS_405,
-        .msr_mask    = 0x00000000020EFF30,
+        .msr_mask    = 0x00000000020EFF30ULL,
     },
 #if defined (TODO)
     /* PowerPC 405 GP */
@@ -2829,7 +2831,7 @@ static ppc_def_t ppc_defs[] = {
         .pvr_mask    = 0xFFFFFFFF,
         .insns_flags = PPC_INSNS_405,
         .flags       = PPC_FLAGS_405,
-        .msr_mask    = 0x00000000020EFF30,
+        .msr_mask    = 0x00000000020EFF30ULL,
     },
 #endif
     /* PowerPC 405 EP */
@@ -2839,7 +2841,7 @@ static ppc_def_t ppc_defs[] = {
         .pvr_mask    = 0xFFFFFFFF,
         .insns_flags = PPC_INSNS_405,
         .flags       = PPC_FLAGS_405,
-        .msr_mask    = 0x00000000020EFF30,
+        .msr_mask    = 0x00000000020EFF30ULL,
     },
 #if defined (TODO)
     /* PowerPC 405 EZ */
@@ -2849,7 +2851,7 @@ static ppc_def_t ppc_defs[] = {
         .pvr_mask    = 0xFFFFFFFF,
         .insns_flags = PPC_INSNS_405,
         .flags       = PPC_FLAGS_405,
-        .msr_mask    = 0x00000000020EFF30,
+        .msr_mask    = 0x00000000020EFF30ULL,
     },
 #endif
 #if defined (TODO)
@@ -2860,10 +2862,9 @@ static ppc_def_t ppc_defs[] = {
         .pvr_mask    = 0xFFFFFFFF,
         .insns_flags = PPC_INSNS_405,
         .flags       = PPC_FLAGS_405,
-        .msr_mask    = 0x00000000020EFF30,
+        .msr_mask    = 0x00000000020EFF30ULL,
     },
 #endif
-#if defined (TODO)
     /* PowerPC 405 D2 */
     {
         .name        = "405d2",
@@ -2871,10 +2872,8 @@ static ppc_def_t ppc_defs[] = {
         .pvr_mask    = 0xFFFFFFFF,
         .insns_flags = PPC_INSNS_405,
         .flags       = PPC_FLAGS_405,
-        .msr_mask    = 0x00000000020EFF30,
+        .msr_mask    = 0x00000000020EFF30ULL,
     },
-#endif
-#if defined (TODO)
     /* PowerPC 405 D4 */
     {
         .name        = "405d4",
@@ -2882,9 +2881,8 @@ static ppc_def_t ppc_defs[] = {
         .pvr_mask    = 0xFFFFFFFF,
         .insns_flags = PPC_INSNS_405,
         .flags       = PPC_FLAGS_405,
-        .msr_mask    = 0x00000000020EFF30,
+        .msr_mask    = 0x00000000020EFF30ULL,
     },
-#endif
 #if defined (TODO)
     /* Npe405 H */
     {
@@ -2893,7 +2891,7 @@ static ppc_def_t ppc_defs[] = {
         .pvr_mask    = 0xFFFFFFFF,
             .insns_flags = PPC_INSNS_405,
         .flags       = PPC_FLAGS_405,
-        .msr_mask    = 0x00000000020EFF30,
+        .msr_mask    = 0x00000000020EFF30ULL,
     },
 #endif
 #if defined (TODO)
@@ -2904,7 +2902,7 @@ static ppc_def_t ppc_defs[] = {
         .pvr_mask    = 0xFFFFFFFF,
         .insns_flags = PPC_INSNS_405,
         .flags       = PPC_FLAGS_405,
-        .msr_mask    = 0x00000000020EFF30,
+        .msr_mask    = 0x00000000020EFF30ULL,
     },
 #endif
 #if defined (TODO)
@@ -2915,7 +2913,7 @@ static ppc_def_t ppc_defs[] = {
         .pvr_mask    = 0xFFFFFFFF,
         .insns_flags = PPC_INSNS_405,
         .flags       = PPC_FLAGS_405,
-        .msr_mask    = 0x00000000020EFF30,
+        .msr_mask    = 0x00000000020EFF30ULL,
     },
 #endif
 #if defined (TODO)
@@ -2926,7 +2924,7 @@ static ppc_def_t ppc_defs[] = {
         .pvr_mask    = 0xFFFFFFFF,
         .insns_flags = PPC_INSNS_405,
         .flags       = PPC_FLAGS_405,
-        .msr_mask    = 0x00000000020EFF30,
+        .msr_mask    = 0x00000000020EFF30ULL,
     },
 #endif
 #if defined (TODO)
@@ -2937,10 +2935,10 @@ static ppc_def_t ppc_defs[] = {
         .pvr_mask    = 0xFFFFFFFF,
         .insns_flags = PPC_INSNS_405,
         .flags       = PPC_FLAGS_405,
-        .msr_mask    = 0x00000000020EFF30,
+        .msr_mask    = 0x00000000020EFF30ULL,
     },
 #endif
-#if defined (TODO) || 1
+#if defined (TODO)
     /* STB03xx */
     {
         .name        = "STB03",
@@ -2948,7 +2946,7 @@ static ppc_def_t ppc_defs[] = {
         .pvr_mask    = 0xFFFFFFFF,
         .insns_flags = PPC_INSNS_405,
         .flags       = PPC_FLAGS_405,
-        .msr_mask    = 0x00000000020EFF30,
+        .msr_mask    = 0x00000000020EFF30ULL,
     },
 #endif
 #if defined (TODO)
@@ -2959,7 +2957,7 @@ static ppc_def_t ppc_defs[] = {
         .pvr_mask    = 0xFFFFFFFF,
         .insns_flags = PPC_INSNS_405,
         .flags       = PPC_FLAGS_405,
-        .msr_mask    = 0x00000000020EFF30,
+        .msr_mask    = 0x00000000020EFF30ULL,
     },
 #endif
 #if defined (TODO)
@@ -2970,10 +2968,10 @@ static ppc_def_t ppc_defs[] = {
         .pvr_mask    = 0xFFFFFFFF,
         .insns_flags = PPC_INSNS_405,
         .flags       = PPC_FLAGS_405,
-        .msr_mask    = 0x00000000020EFF30,
+        .msr_mask    = 0x00000000020EFF30ULL,
     },
 #endif
-#if defined (TODO) || 1
+#if defined (TODO)
     /* STB25xx */
     {
         .name        = "STB25",
@@ -2981,7 +2979,7 @@ static ppc_def_t ppc_defs[] = {
         .pvr_mask    = 0xFFFFFFFF,
         .insns_flags = PPC_INSNS_405,
         .flags       = PPC_FLAGS_405,
-        .msr_mask    = 0x00000000020EFF30,
+        .msr_mask    = 0x00000000020EFF30ULL,
     },
 #endif
 #if defined (TODO)
@@ -2992,7 +2990,7 @@ static ppc_def_t ppc_defs[] = {
         .pvr_mask    = 0xFFFFFFFF,
         .insns_flags = PPC_INSNS_405,
         .flags       = PPC_FLAGS_405,
-        .msr_mask    = 0x00000000020EFF30,
+        .msr_mask    = 0x00000000020EFF30ULL,
     },
 #endif
         /* Xilinx PowerPC 405 cores */
@@ -3003,7 +3001,7 @@ static ppc_def_t ppc_defs[] = {
         .pvr_mask    = 0xFFFFFFFF,
         .insns_flags = PPC_INSNS_405,
         .flags       = PPC_FLAGS_405,
-        .msr_mask    = 0x00000000020EFF30,
+        .msr_mask    = 0x00000000020EFF30ULL,
     },
     {
         .name        = "x2vp7",
@@ -3011,7 +3009,7 @@ static ppc_def_t ppc_defs[] = {
         .pvr_mask    = 0xFFFFFFFF,
         .insns_flags = PPC_INSNS_405,
         .flags       = PPC_FLAGS_405,
-        .msr_mask    = 0x00000000020EFF30,
+        .msr_mask    = 0x00000000020EFF30ULL,
     },
     {
         .name        = "x2vp20",
@@ -3019,7 +3017,7 @@ static ppc_def_t ppc_defs[] = {
         .pvr_mask    = 0xFFFFFFFF,
         .insns_flags = PPC_INSNS_405,
         .flags       = PPC_FLAGS_405,
-        .msr_mask    = 0x00000000020EFF30,
+        .msr_mask    = 0x00000000020EFF30ULL,
     },
     {
         .name        = "x2vp50",
@@ -3027,7 +3025,7 @@ static ppc_def_t ppc_defs[] = {
         .pvr_mask    = 0xFFFFFFFF,
         .insns_flags = PPC_INSNS_405,
         .flags       = PPC_FLAGS_405,
-        .msr_mask    = 0x00000000020EFF30,
+        .msr_mask    = 0x00000000020EFF30ULL,
     },
 #endif
 #if defined (TODO)
@@ -3038,7 +3036,7 @@ static ppc_def_t ppc_defs[] = {
         .pvr_mask    = 0xFFFF0000,
         .insns_flags = PPC_INSNS_440,
         .flags       = PPC_FLAGS_440,
-        .msr_mask    = 0x000000000006D630,
+        .msr_mask    = 0x000000000006D630ULL,
     },
 #endif
 #if defined (TODO)
@@ -3049,7 +3047,7 @@ static ppc_def_t ppc_defs[] = {
         .pvr_mask    = 0xFFFF0000,
         .insns_flags = PPC_INSNS_440,
         .flags       = PPC_FLAGS_440,
-        .msr_mask    = 0x000000000006D630,
+        .msr_mask    = 0x000000000006D630ULL,
     },
 #endif
 #if defined (TODO)
@@ -3060,7 +3058,7 @@ static ppc_def_t ppc_defs[] = {
         .pvr_mask    = 0xFFFFFF00,
         .insns_flags = PPC_INSNS_440,
         .flags       = PPC_FLAGS_440,
-        .msr_mask    = 0x000000000006D630,
+        .msr_mask    = 0x000000000006D630ULL,
     },
 #endif
 #if defined (TODO)
@@ -3071,7 +3069,7 @@ static ppc_def_t ppc_defs[] = {
         .pvr_mask    = 0xFFFF0000,
         .insns_flags = PPC_INSNS_405,
         .flags       = PPC_FLAGS_440,
-        .msr_mask    = 0x000000000006D630,
+        .msr_mask    = 0x000000000006D630ULL,
     },
 #endif
 #if defined (TODO)
@@ -3082,7 +3080,7 @@ static ppc_def_t ppc_defs[] = {
         .pvr_mask    = 0xFFFF0000,
         .insns_flags = PPC_INSNS_405,
         .flags       = PPC_FLAGS_440,
-        .msr_mask    = 0x000000000006D630,
+        .msr_mask    = 0x000000000006D630ULL,
     },
 #endif
 #if defined (TODO)
@@ -3093,7 +3091,7 @@ static ppc_def_t ppc_defs[] = {
         .pvr_mask    = 0xFFFF0000,
         .insns_flags = PPC_INSNS_405,
         .flags       = PPC_FLAGS_440,
-        .msr_mask    = 0x000000000006D630,
+        .msr_mask    = 0x000000000006D630ULL,
     },
 #endif
 #if defined (TODO)
@@ -3104,7 +3102,7 @@ static ppc_def_t ppc_defs[] = {
         .pvr_mask    = 0xFFFF0000,
         .insns_flags = PPC_INSNS_405,
         .flags       = PPC_FLAGS_440,
-        .msr_mask    = 0x000000000006D630,
+        .msr_mask    = 0x000000000006D630ULL,
     },
 #endif
 #if defined (TODO)
@@ -3115,7 +3113,7 @@ static ppc_def_t ppc_defs[] = {
         .pvr_mask    = 0xFFFF0000,
         .insns_flags = PPC_INSNS_405,
         .flags       = PPC_FLAGS_440,
-        .msr_mask    = 0x000000000006D630,
+        .msr_mask    = 0x000000000006D630ULL,
     },
 #endif
 #if defined (TODO)
@@ -3126,7 +3124,7 @@ static ppc_def_t ppc_defs[] = {
         .pvr_mask    = 0xFFFF0000,
         .insns_flags = PPC_INSNS_405,
         .flags       = PPC_FLAGS_440,
-        .msr_mask    = 0x000000000006D630,
+        .msr_mask    = 0x000000000006D630ULL,
     },
 #endif
     /* Fake generic BookE PowerPC */
@@ -3136,7 +3134,7 @@ static ppc_def_t ppc_defs[] = {
         .pvr_mask    = 0xFFFFFFFF,
         .insns_flags = PPC_INSNS_BOOKE,
         .flags       = PPC_FLAGS_BOOKE,
-        .msr_mask    = 0x000000000006D630,
+        .msr_mask    = 0x000000000006D630ULL,
     },
     /* PowerPC 460 cores - TODO */
     /* PowerPC MPC 5xx cores - TODO */
@@ -3155,7 +3153,7 @@ static ppc_def_t ppc_defs[] = {
         .pvr_mask    = 0xFFFF0000,
         .insns_flags = PPC_INSNS_601,
         .flags       = PPC_FLAGS_601,
-        .msr_mask    = 0x000000000000FD70,
+        .msr_mask    = 0x000000000000FD70ULL,
     },
 #endif
 #if defined (TODO)
@@ -3166,7 +3164,7 @@ static ppc_def_t ppc_defs[] = {
         .pvr_mask    = 0xFFFF0000,
         .insns_flags = PPC_INSNS_602,
         .flags       = PPC_FLAGS_602,
-        .msr_mask    = 0x0000000000C7FF73,
+        .msr_mask    = 0x0000000000C7FF73ULL,
     },
 #endif
     /* PowerPC 603 */
@@ -3176,7 +3174,7 @@ static ppc_def_t ppc_defs[] = {
         .pvr_mask    = 0xFFFFFFFF,
         .insns_flags = PPC_INSNS_603,
         .flags       = PPC_FLAGS_603,
-        .msr_mask    = 0x000000000007FF73,
+        .msr_mask    = 0x000000000007FF73ULL,
     },
     /* PowerPC 603e */
     {
@@ -3185,7 +3183,7 @@ static ppc_def_t ppc_defs[] = {
         .pvr_mask    = 0xFFFFFFFF,
         .insns_flags = PPC_INSNS_603,
         .flags       = PPC_FLAGS_603,
-        .msr_mask    = 0x000000000007FF73,
+        .msr_mask    = 0x000000000007FF73ULL,
     },
     {
         .name        = "Stretch",
@@ -3193,7 +3191,7 @@ static ppc_def_t ppc_defs[] = {
         .pvr_mask    = 0xFFFFFFFF,
         .insns_flags = PPC_INSNS_603,
         .flags       = PPC_FLAGS_603,
-        .msr_mask    = 0x000000000007FF73,
+        .msr_mask    = 0x000000000007FF73ULL,
     },
     /* PowerPC 603p */
     {
@@ -3202,7 +3200,7 @@ static ppc_def_t ppc_defs[] = {
         .pvr_mask    = 0xFFFFFFFF,
         .insns_flags = PPC_INSNS_603,
         .flags       = PPC_FLAGS_603,
-        .msr_mask    = 0x000000000007FF73,
+        .msr_mask    = 0x000000000007FF73ULL,
     },
     /* PowerPC 603e7 */
     {
@@ -3211,7 +3209,7 @@ static ppc_def_t ppc_defs[] = {
         .pvr_mask    = 0xFFFFFFFF,
         .insns_flags = PPC_INSNS_603,
         .flags       = PPC_FLAGS_603,
-        .msr_mask    = 0x000000000007FF73,
+        .msr_mask    = 0x000000000007FF73ULL,
     },
     /* PowerPC 603e7v */
     {
@@ -3220,7 +3218,7 @@ static ppc_def_t ppc_defs[] = {
         .pvr_mask    = 0xFFFFFFFF,
         .insns_flags = PPC_INSNS_603,
         .flags       = PPC_FLAGS_603,
-        .msr_mask    = 0x000000000007FF73,
+        .msr_mask    = 0x000000000007FF73ULL,
     },
     /* PowerPC 603e7v2 */
     {
@@ -3229,7 +3227,7 @@ static ppc_def_t ppc_defs[] = {
         .pvr_mask    = 0xFFFFFFFF,
         .insns_flags = PPC_INSNS_603,
         .flags       = PPC_FLAGS_603,
-        .msr_mask    = 0x000000000007FF73,
+        .msr_mask    = 0x000000000007FF73ULL,
     },
     /* PowerPC 603r */
     {
@@ -3238,7 +3236,7 @@ static ppc_def_t ppc_defs[] = {
         .pvr_mask    = 0xFFFFFFFF,
         .insns_flags = PPC_INSNS_603,
         .flags       = PPC_FLAGS_603,
-        .msr_mask    = 0x000000000007FF73,
+        .msr_mask    = 0x000000000007FF73ULL,
     },
     {
         .name        = "Goldeneye",
@@ -3246,7 +3244,7 @@ static ppc_def_t ppc_defs[] = {
         .pvr_mask    = 0xFFFFFFFF,
         .insns_flags = PPC_INSNS_603,
         .flags       = PPC_FLAGS_603,
-        .msr_mask    = 0x000000000007FF73,
+        .msr_mask    = 0x000000000007FF73ULL,
     },
 #if defined (TODO)
     /* XXX: TODO: according to Motorola UM, this is a derivative to 603e */
@@ -3256,7 +3254,7 @@ static ppc_def_t ppc_defs[] = {
         .pvr_mask    = 0xFFFF0000,
         .insns_flags = PPC_INSNS_G2,
         .flags       = PPC_FLAGS_G2,
-        .msr_mask    = 0x000000000006FFF2,
+        .msr_mask    = 0x000000000006FFF2ULL,
     },
     {
         .name        = "G2h4",
@@ -3264,7 +3262,7 @@ static ppc_def_t ppc_defs[] = {
         .pvr_mask    = 0xFFFF0000,
         .insns_flags = PPC_INSNS_G2,
         .flags       = PPC_FLAGS_G2,
-        .msr_mask    = 0x000000000006FFF2,
+        .msr_mask    = 0x000000000006FFF2ULL,
     },
     {
         .name        = "G2gp",
@@ -3272,7 +3270,7 @@ static ppc_def_t ppc_defs[] = {
         .pvr_mask    = 0xFFFF0000,
         .insns_flags = PPC_INSNS_G2,
         .flags       = PPC_FLAGS_G2,
-        .msr_mask    = 0x000000000006FFF2,
+        .msr_mask    = 0x000000000006FFF2ULL,
     },
     {
         .name        = "G2ls",
@@ -3280,7 +3278,7 @@ static ppc_def_t ppc_defs[] = {
         .pvr_mask    = 0xFFFF0000,
         .insns_flags = PPC_INSNS_G2,
         .flags       = PPC_FLAGS_G2,
-        .msr_mask    = 0x000000000006FFF2,
+        .msr_mask    = 0x000000000006FFF2ULL,
     },
     { /* Same as G2, with LE mode support */
         .name        = "G2le",
@@ -3288,7 +3286,7 @@ static ppc_def_t ppc_defs[] = {
         .pvr_mask    = 0xFFFF0000,
         .insns_flags = PPC_INSNS_G2,
         .flags       = PPC_FLAGS_G2,
-        .msr_mask    = 0x000000000007FFF3,
+        .msr_mask    = 0x000000000007FFF3ULL,
     },
     {
         .name        = "G2legp",
@@ -3296,7 +3294,7 @@ static ppc_def_t ppc_defs[] = {
         .pvr_mask    = 0xFFFF0000,
         .insns_flags = PPC_INSNS_G2,
         .flags       = PPC_FLAGS_G2,
-        .msr_mask    = 0x000000000007FFF3,
+        .msr_mask    = 0x000000000007FFF3ULL,
     },
     {
         .name        = "G2lels",
@@ -3304,7 +3302,7 @@ static ppc_def_t ppc_defs[] = {
         .pvr_mask    = 0xFFFF0000,
         .insns_flags = PPC_INSNS_G2,
         .flags       = PPC_FLAGS_G2,
-        .msr_mask    = 0x000000000007FFF3,
+        .msr_mask    = 0x000000000007FFF3ULL,
     },
 #endif
     /* PowerPC 604 */
@@ -3314,7 +3312,7 @@ static ppc_def_t ppc_defs[] = {
         .pvr_mask    = 0xFFFFFFFF,
         .insns_flags = PPC_INSNS_604,
         .flags       = PPC_FLAGS_604,
-        .msr_mask    = 0x000000000005FF77,
+        .msr_mask    = 0x000000000005FF77ULL,
     },
     /* PowerPC 604e */
     {
@@ -3323,7 +3321,7 @@ static ppc_def_t ppc_defs[] = {
         .pvr_mask    = 0xFFFFFFFF,
         .insns_flags = PPC_INSNS_604,
         .flags       = PPC_FLAGS_604,
-        .msr_mask    = 0x000000000005FF77,
+        .msr_mask    = 0x000000000005FF77ULL,
     },
     /* PowerPC 604r */
     {
@@ -3332,7 +3330,7 @@ static ppc_def_t ppc_defs[] = {
         .pvr_mask    = 0xFFFFFFFF,
         .insns_flags = PPC_INSNS_604,
         .flags       = PPC_FLAGS_604,
-        .msr_mask    = 0x000000000005FF77,
+        .msr_mask    = 0x000000000005FF77ULL,
     },
     /* generic G3 */
     {
@@ -3341,7 +3339,7 @@ static ppc_def_t ppc_defs[] = {
         .pvr_mask    = 0xFFFFFFFF,
         .insns_flags = PPC_INSNS_7x0,
         .flags       = PPC_FLAGS_7x0,
-        .msr_mask    = 0x000000000007FF77,
+        .msr_mask    = 0x000000000007FF77ULL,
     },
     /* MPC740 (G3) */
     {
@@ -3350,7 +3348,7 @@ static ppc_def_t ppc_defs[] = {
         .pvr_mask    = 0xFFFFFFFF,
         .insns_flags = PPC_INSNS_7x0,
         .flags       = PPC_FLAGS_7x0,
-        .msr_mask    = 0x000000000007FF77,
+        .msr_mask    = 0x000000000007FF77ULL,
     },
     {
         .name        = "Arthur",
@@ -3358,7 +3356,7 @@ static ppc_def_t ppc_defs[] = {
         .pvr_mask    = 0xFFFFFFFF,
         .insns_flags = PPC_INSNS_7x0,
         .flags       = PPC_FLAGS_7x0,
-        .msr_mask    = 0x000000000007FF77,
+        .msr_mask    = 0x000000000007FF77ULL,
     },
 #if defined (TODO)
     /* MPC745 (G3) */
@@ -3368,7 +3366,7 @@ static ppc_def_t ppc_defs[] = {
         .pvr_mask    = 0xFFFFF000,
         .insns_flags = PPC_INSNS_7x5,
         .flags       = PPC_FLAGS_7x5,
-        .msr_mask    = 0x000000000007FF77,
+        .msr_mask    = 0x000000000007FF77ULL,
     },
     {
         .name        = "Goldfinger",
@@ -3376,7 +3374,7 @@ static ppc_def_t ppc_defs[] = {
         .pvr_mask    = 0xFFFFF000,
         .insns_flags = PPC_INSNS_7x5,
         .flags       = PPC_FLAGS_7x5,
-        .msr_mask    = 0x000000000007FF77,
+        .msr_mask    = 0x000000000007FF77ULL,
     },
 #endif
     /* MPC750 (G3) */
@@ -3386,7 +3384,7 @@ static ppc_def_t ppc_defs[] = {
         .pvr_mask    = 0xFFFFFFFF,
         .insns_flags = PPC_INSNS_7x0,
         .flags       = PPC_FLAGS_7x0,
-        .msr_mask    = 0x000000000007FF77,
+        .msr_mask    = 0x000000000007FF77ULL,
     },
 #if defined (TODO)
     /* MPC755 (G3) */
@@ -3396,7 +3394,7 @@ static ppc_def_t ppc_defs[] = {
         .pvr_mask    = 0xFFFFF000,
         .insns_flags = PPC_INSNS_7x5,
         .flags       = PPC_FLAGS_7x5,
-        .msr_mask    = 0x000000000007FF77,
+        .msr_mask    = 0x000000000007FF77ULL,
     },
 #endif
     /* MPC740P (G3) */
@@ -3406,7 +3404,7 @@ static ppc_def_t ppc_defs[] = {
         .pvr_mask    = 0xFFFFFFFF,
         .insns_flags = PPC_INSNS_7x0,
         .flags       = PPC_FLAGS_7x0,
-        .msr_mask    = 0x000000000007FF77,
+        .msr_mask    = 0x000000000007FF77ULL,
     },
     {
         .name        = "Conan/Doyle",
@@ -3414,7 +3412,7 @@ static ppc_def_t ppc_defs[] = {
         .pvr_mask    = 0xFFFFFFFF,
         .insns_flags = PPC_INSNS_7x0,
         .flags       = PPC_FLAGS_7x0,
-        .msr_mask    = 0x000000000007FF77,
+        .msr_mask    = 0x000000000007FF77ULL,
     },
 #if defined (TODO)
     /* MPC745P (G3) */
@@ -3424,7 +3422,7 @@ static ppc_def_t ppc_defs[] = {
         .pvr_mask    = 0xFFFFF000,
         .insns_flags = PPC_INSNS_7x5,
         .flags       = PPC_FLAGS_7x5,
-        .msr_mask    = 0x000000000007FF77,
+        .msr_mask    = 0x000000000007FF77ULL,
     },
 #endif
     /* MPC750P (G3) */
@@ -3434,7 +3432,7 @@ static ppc_def_t ppc_defs[] = {
         .pvr_mask    = 0xFFFFFFFF,
         .insns_flags = PPC_INSNS_7x0,
         .flags       = PPC_FLAGS_7x0,
-        .msr_mask    = 0x000000000007FF77,
+        .msr_mask    = 0x000000000007FF77ULL,
     },
 #if defined (TODO)
     /* MPC755P (G3) */
@@ -3444,7 +3442,7 @@ static ppc_def_t ppc_defs[] = {
         .pvr_mask    = 0xFFFFF000,
         .insns_flags = PPC_INSNS_7x5,
         .flags       = PPC_FLAGS_7x5,
-        .msr_mask    = 0x000000000007FF77,
+        .msr_mask    = 0x000000000007FF77ULL,
     },
 #endif
     /* IBM 750CXe (G3 embedded) */
@@ -3454,7 +3452,7 @@ static ppc_def_t ppc_defs[] = {
         .pvr_mask    = 0xFFFFFFFF,
         .insns_flags = PPC_INSNS_7x0,
         .flags       = PPC_FLAGS_7x0,
-        .msr_mask    = 0x000000000007FF77,
+        .msr_mask    = 0x000000000007FF77ULL,
     },
     /* IBM 750FX (G3 embedded) */
     {
@@ -3463,7 +3461,7 @@ static ppc_def_t ppc_defs[] = {
         .pvr_mask    = 0xFFFFFFFF,
         .insns_flags = PPC_INSNS_7x0,
         .flags       = PPC_FLAGS_7x0,
-        .msr_mask    = 0x000000000007FF77,
+        .msr_mask    = 0x000000000007FF77ULL,
     },
     /* IBM 750GX (G3 embedded) */
     {
@@ -3472,7 +3470,7 @@ static ppc_def_t ppc_defs[] = {
         .pvr_mask    = 0xFFFFFFFF,
         .insns_flags = PPC_INSNS_7x0,
         .flags       = PPC_FLAGS_7x0,
-        .msr_mask    = 0x000000000007FF77,
+        .msr_mask    = 0x000000000007FF77ULL,
     },
 #if defined (TODO)
     /* generic G4 */
@@ -3482,7 +3480,7 @@ static ppc_def_t ppc_defs[] = {
         .pvr_mask    = 0xFFFF0000,
         .insns_flags = PPC_INSNS_74xx,
         .flags       = PPC_FLAGS_74xx,
-        .msr_mask    = 0x000000000205FF77,
+        .msr_mask    = 0x000000000205FF77ULL,
     },
 #endif
 #if defined (TODO)
@@ -3493,7 +3491,7 @@ static ppc_def_t ppc_defs[] = {
         .pvr_mask    = 0xFFFF0000,
         .insns_flags = PPC_INSNS_74xx,
         .flags       = PPC_FLAGS_74xx,
-        .msr_mask    = 0x000000000205FF77,
+        .msr_mask    = 0x000000000205FF77ULL,
     },
     {
         .name        = "Max",
@@ -3501,7 +3499,7 @@ static ppc_def_t ppc_defs[] = {
         .pvr_mask    = 0xFFFF0000,
         .insns_flags = PPC_INSNS_74xx,
         .flags       = PPC_FLAGS_74xx,
-        .msr_mask    = 0x000000000205FF77,
+        .msr_mask    = 0x000000000205FF77ULL,
     },
 #endif
 #if defined (TODO)
@@ -3512,7 +3510,7 @@ static ppc_def_t ppc_defs[] = {
         .pvr_mask    = 0xFFFF0000,
         .insns_flags = PPC_INSNS_74xx,
         .flags       = PPC_FLAGS_74xx,
-        .msr_mask    = 0x000000000205FF77,
+        .msr_mask    = 0x000000000205FF77ULL,
     },
     {
         .name        = "Nitro",
@@ -3520,7 +3518,7 @@ static ppc_def_t ppc_defs[] = {
         .pvr_mask    = 0xFFFF0000,
         .insns_flags = PPC_INSNS_74xx,
         .flags       = PPC_FLAGS_74xx,
-        .msr_mask    = 0x000000000205FF77,
+        .msr_mask    = 0x000000000205FF77ULL,
     },
 #endif
     /* XXX: 7441 */
@@ -3535,7 +3533,7 @@ static ppc_def_t ppc_defs[] = {
         .pvr_mask    = 0xFFFF0000,
         .insns_flags = PPC_INSNS_74xx,
         .flags       = PPC_FLAGS_74xx,
-        .msr_mask    = 0x000000000205FF77,
+        .msr_mask    = 0x000000000205FF77ULL,
     },
     {
         .name        = "Vger",
@@ -3543,7 +3541,7 @@ static ppc_def_t ppc_defs[] = {
         .pvr_mask    = 0xFFFF0000,
         .insns_flags = PPC_INSNS_74xx,
         .flags       = PPC_FLAGS_74xx,
-        .msr_mask    = 0x000000000205FF77,
+        .msr_mask    = 0x000000000205FF77ULL,
     },
 #endif
     /* XXX: 7451 */
@@ -3555,7 +3553,7 @@ static ppc_def_t ppc_defs[] = {
         .pvr_mask    = 0xFFFF0000,
         .insns_flags = PPC_INSNS_74xx,
         .flags       = PPC_FLAGS_74xx,
-        .msr_mask    = 0x000000000205FF77,
+        .msr_mask    = 0x000000000205FF77ULL,
     },
     {
         .name        = "Apollo 6",
@@ -3563,7 +3561,7 @@ static ppc_def_t ppc_defs[] = {
         .pvr_mask    = 0xFFFF0000,
         .insns_flags = PPC_INSNS_74xx,
         .flags       = PPC_FLAGS_74xx,
-        .msr_mask    = 0x000000000205FF77,
+        .msr_mask    = 0x000000000205FF77ULL,
     },
 #endif
 #if defined (TODO)
@@ -3574,7 +3572,7 @@ static ppc_def_t ppc_defs[] = {
         .pvr_mask    = 0xFFFF0000,
         .insns_flags = PPC_INSNS_74xx,
         .flags       = PPC_FLAGS_74xx,
-        .msr_mask    = 0x000000000205FF77,
+        .msr_mask    = 0x000000000205FF77ULL,
     },
     {
         .name        = "Apollo 7",
@@ -3582,7 +3580,7 @@ static ppc_def_t ppc_defs[] = {
         .pvr_mask    = 0xFFFF0000,
         .insns_flags = PPC_INSNS_74xx,
         .flags       = PPC_FLAGS_74xx,
-        .msr_mask    = 0x000000000205FF77,
+        .msr_mask    = 0x000000000205FF77ULL,
     },
 #endif
 #if defined (TODO)
@@ -3593,7 +3591,7 @@ static ppc_def_t ppc_defs[] = {
         .pvr_mask    = 0xFFFF0000,
         .insns_flags = PPC_INSNS_74xx,
         .flags       = PPC_FLAGS_74xx,
-        .msr_mask    = 0x000000000205FF77,
+        .msr_mask    = 0x000000000205FF77ULL,
     },
     {
         .name        = "Apollo 7 PM",
@@ -3601,7 +3599,7 @@ static ppc_def_t ppc_defs[] = {
         .pvr_mask    = 0xFFFF0000,
         .insns_flags = PPC_INSNS_74xx,
         .flags       = PPC_FLAGS_74xx,
-        .msr_mask    = 0x000000000205FF77,
+        .msr_mask    = 0x000000000205FF77ULL,
     },
 #endif
     /* 64 bits PowerPC */
@@ -3614,7 +3612,7 @@ static ppc_def_t ppc_defs[] = {
         .pvr_mask    = 0xFFFF0000,
         .insns_flags = PPC_INSNS_620,
         .flags       = PPC_FLAGS_620,
-        .msr_mask    = 0x800000000005FF73,
+        .msr_mask    = 0x800000000005FF73ULL,
     },
 #endif
 #if defined (TODO)
@@ -3699,7 +3697,7 @@ static ppc_def_t ppc_defs[] = {
         .msr_mask    = xxx,
     },
 #endif
-#if defined (TODO) || 1
+#if defined (TODO)
     /* PowerPC 970 */
     {
         .name        = "970",
@@ -3707,7 +3705,7 @@ static ppc_def_t ppc_defs[] = {
         .pvr_mask    = 0xFFFF0000,
         .insns_flags = PPC_INSNS_970,
         .flags       = PPC_FLAGS_970,
-        .msr_mask    = 0x900000000204FF36,
+        .msr_mask    = 0x900000000204FF36ULL,
     },
 #endif
 #if defined (TODO)
@@ -3718,7 +3716,7 @@ static ppc_def_t ppc_defs[] = {
         .pvr_mask    = 0xFFFF0000,
         .insns_flags = PPC_INSNS_970FX,
         .flags       = PPC_FLAGS_970FX,
-        .msr_mask    = 0x800000000204FF36,
+        .msr_mask    = 0x800000000204FF36ULL,
     },
 #endif
 #if defined (TODO)
@@ -3857,14 +3855,14 @@ static ppc_def_t ppc_defs[] = {
     },
 #endif
     /* Generic PowerPCs */
-#if defined (TODO) || 1
+#if defined (TODO)
     {
         .name        = "ppc64",
         .pvr         = CPU_PPC_970,
         .pvr_mask    = 0xFFFF0000,
         .insns_flags = PPC_INSNS_PPC64,
         .flags       = PPC_FLAGS_PPC64,
-        .msr_mask    = 0xA00000000204FF36,
+        .msr_mask    = 0xA00000000204FF36ULL,
     },
 #endif
     {
@@ -3873,7 +3871,7 @@ static ppc_def_t ppc_defs[] = {
         .pvr_mask    = 0xFFFFFFFF,
         .insns_flags = PPC_INSNS_PPC32,
         .flags       = PPC_FLAGS_PPC32,
-        .msr_mask    = 0x000000000005FF77,
+        .msr_mask    = 0x000000000005FF77ULL,
     },
     /* Fallback */
     {
@@ -3882,7 +3880,7 @@ static ppc_def_t ppc_defs[] = {
         .pvr_mask    = 0xFFFFFFFF,
         .insns_flags = PPC_INSNS_PPC32,
         .flags       = PPC_FLAGS_PPC32,
-        .msr_mask    = 0x000000000005FF77,
+        .msr_mask    = 0x000000000005FF77ULL,
     },
 };
 
diff --git a/vl.h b/vl.h
index fbad5e2a19..c4be86d25b 100644
--- a/vl.h
+++ b/vl.h
@@ -1172,58 +1172,6 @@ int ppc_dcr_init (CPUState *env, int (*dcr_read_error)(int dcrn),
 int ppc_dcr_register (CPUState *env, int dcrn, void *opaque,
                       dcr_read_cb drc_read, dcr_write_cb dcr_write);
 clk_setup_cb ppc_emb_timers_init (CPUState *env, uint32_t freq);
-/* PowerPC 405 core */
-CPUPPCState *ppc405_init (const unsigned char *cpu_model,
-                          clk_setup_t *cpu_clk, clk_setup_t *tb_clk,
-                          uint32_t sysclk);
-void ppc40x_core_reset (CPUState *env);
-void ppc40x_chip_reset (CPUState *env);
-void ppc40x_system_reset (CPUState *env);
-/* */
-typedef struct ppc4xx_mmio_t ppc4xx_mmio_t;
-int ppc4xx_mmio_register (CPUState *env, ppc4xx_mmio_t *mmio,
-                          uint32_t offset, uint32_t len,
-                          CPUReadMemoryFunc **mem_read,
-                          CPUWriteMemoryFunc **mem_write, void *opaque);
-ppc4xx_mmio_t *ppc4xx_mmio_init (CPUState *env, uint32_t base);
-/* PowerPC 4xx peripheral local bus arbitrer */
-void ppc4xx_plb_init (CPUState *env);
-/* PLB to OPB bridge */
-void ppc4xx_pob_init (CPUState *env);
-/* OPB arbitrer */
-void ppc4xx_opba_init (CPUState *env, ppc4xx_mmio_t *mmio, uint32_t offset);
-/* PowerPC 4xx universal interrupt controller */
-enum {
-    PPCUIC_OUTPUT_INT = 0,
-    PPCUIC_OUTPUT_CINT = 1,
-    PPCUIC_OUTPUT_NB,
-};
-qemu_irq *ppcuic_init (CPUState *env, qemu_irq *irqs,
-                       uint32_t dcr_base, int has_ssr, int has_vr);
-/* SDRAM controller */
-void ppc405_sdram_init (CPUState *env, qemu_irq irq, int nbanks,
-                        target_ulong *ram_bases, target_ulong *ram_sizes);
-/* Peripheral controller */
-void ppc405_ebc_init (CPUState *env);
-/* DMA controller */
-void ppc405_dma_init (CPUState *env, qemu_irq irqs[4]);
-/* GPIO */
-void ppc405_gpio_init (CPUState *env, ppc4xx_mmio_t *mmio, uint32_t offset);
-/* Serial ports */
-void ppc405_serial_init (CPUState *env, ppc4xx_mmio_t *mmio,
-                         uint32_t offset, qemu_irq irq,
-                         CharDriverState *chr);
-/* On Chip Memory */
-void ppc405_ocm_init (CPUState *env, unsigned long offset);
-/* I2C controller */
-void ppc405_i2c_init (CPUState *env, ppc4xx_mmio_t *mmio, uint32_t offset);
-/* PowerPC 405 microcontrollers */
-CPUState *ppc405cr_init (target_ulong ram_bases[4], target_ulong ram_sizes[4],
-                         uint32_t sysclk, qemu_irq **picp,
-                         ram_addr_t *offsetp);
-CPUState *ppc405ep_init (target_ulong ram_bases[2], target_ulong ram_sizes[2],
-                         uint32_t sysclk, qemu_irq **picp,
-                         ram_addr_t *offsetp);
 #endif
 void PREP_debug_write (void *opaque, uint32_t addr, uint32_t val);