added entry parameter to ELF loader

[qemu] / hw / sun4u.c

diff --git a/hw/sun4u.c b/hw/sun4u.c
index 40d70a9..208d3dd 100644 (file)
--- a/hw/sun4u.c
+++ b/hw/sun4u.c
@@ -27,6 +27,7 @@
 #define KERNEL_LOAD_ADDR     0x00404000
 #define CMDLINE_ADDR         0x003ff000
 #define INITRD_LOAD_ADDR     0x00300000
+#define PROM_SIZE_MAX        (256 * 1024)
 #define PROM_ADDR           0x1fff0000000ULL
 #define APB_SPECIAL_BASE     0x1fe00000000ULL
 #define APB_MEM_BASE        0x1ff00000000ULL
@@ -235,6 +236,12 @@ void qemu_system_powerdown(void)
 {
 }
 
+static void main_cpu_reset(void *opaque)
+{
+    CPUState *env = opaque;
+    cpu_reset(env);
+}
+
 static const int ide_iobase[2] = { 0x1f0, 0x170 };
 static const int ide_iobase2[2] = { 0x3f6, 0x376 };
 static const int ide_irq[2] = { 14, 15 };
@@ -253,6 +260,7 @@ static void sun4u_init(int ram_size, int vga_ram_size, int boot_device,
              const char *kernel_filename, const char *kernel_cmdline,
              const char *initrd_filename)
 {
+    CPUState *env;
     char buf[1024];
     m48t59_t *nvram;
     int ret, linux_boot;
@@ -262,13 +270,20 @@ static void sun4u_init(int ram_size, int vga_ram_size, int boot_device,
 
     linux_boot = (kernel_filename != NULL);
 
+    env = cpu_init();
+    register_savevm("cpu", 0, 3, cpu_save, cpu_load, env);
+    qemu_register_reset(main_cpu_reset, env);
+
     /* allocate RAM */
     cpu_register_physical_memory(0, ram_size, 0);
 
     prom_offset = ram_size + vga_ram_size;
+    cpu_register_physical_memory(PROM_ADDR, 
+                                 (PROM_SIZE_MAX + TARGET_PAGE_SIZE) & TARGET_PAGE_MASK, 
+                                 prom_offset | IO_MEM_ROM);
 
     snprintf(buf, sizeof(buf), "%s/%s", bios_dir, PROM_FILENAMEE);
-    ret = load_elf(buf, phys_ram_base + prom_offset);
+    ret = load_elf(buf, 0, NULL);
     if (ret < 0) {
        snprintf(buf, sizeof(buf), "%s/%s", bios_dir, PROM_FILENAMEB);
        ret = load_image(buf, phys_ram_base + prom_offset);
@@ -278,13 +293,12 @@ static void sun4u_init(int ram_size, int vga_ram_size, int boot_device,
                buf);
        exit(1);
     }
-    cpu_register_physical_memory(PROM_ADDR, (ret + TARGET_PAGE_SIZE) & TARGET_PAGE_MASK, 
-                                 prom_offset | IO_MEM_ROM);
 
     kernel_size = 0;
     initrd_size = 0;
     if (linux_boot) {
-        kernel_size = load_elf(kernel_filename, phys_ram_base + KERNEL_LOAD_ADDR);
+        /* XXX: put correct offset */
+        kernel_size = load_elf(kernel_filename, 0, NULL);
         if (kernel_size < 0)
            kernel_size = load_aout(kernel_filename, phys_ram_base + KERNEL_LOAD_ADDR);
        if (kernel_size < 0)
@@ -324,7 +338,8 @@ static void sun4u_init(int ram_size, int vga_ram_size, int boot_device,
 
     for(i = 0; i < MAX_SERIAL_PORTS; i++) {
         if (serial_hds[i]) {
-            serial_init(serial_io[i], serial_irq[i], serial_hds[i]);
+            serial_init(&pic_set_irq_new, NULL,
+                        serial_io[i], serial_irq[i], serial_hds[i]);
         }
     }
 
@@ -335,7 +350,9 @@ static void sun4u_init(int ram_size, int vga_ram_size, int boot_device,
     }
 
     for(i = 0; i < nb_nics; i++) {
-       pci_ne2000_init(pci_bus, &nd_table[i]);
+        if (!nd_table[i].model)
+            nd_table[i].model = "ne2k_pci";
+       pci_nic_init(pci_bus, &nd_table[i]);
     }
 
     pci_cmd646_ide_init(pci_bus, bs_table, 1);