[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 07/33] target-alpha: Enable the alpha-softmmu target
From: |
Richard Henderson |
Subject: |
[Qemu-devel] [PATCH 07/33] target-alpha: Enable the alpha-softmmu target. |
Date: |
Thu, 28 Apr 2011 13:50:49 -0700 |
Compiles, but no machine defined yet, so this will crash on startup.
Signed-off-by: Richard Henderson <address@hidden>
---
Makefile.target | 3 +-
configure | 1 +
default-configs/alpha-softmmu.mak | 9 ++++
target-alpha/machine.c | 87 +++++++++++++++++++++++++++++++++++++
4 files changed, 99 insertions(+), 1 deletions(-)
create mode 100644 default-configs/alpha-softmmu.mak
create mode 100644 target-alpha/machine.c
diff --git a/Makefile.target b/Makefile.target
index 237e912..7c194c2 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -364,7 +364,8 @@ obj-m68k-y += m68k-semi.o dummy_m68k.o
obj-s390x-y = s390-virtio-bus.o s390-virtio.o
-obj-alpha-y =
+obj-alpha-y += i8259.o mc146818rtc.o
+obj-alpha-y += vga.o cirrus_vga.o
main.o: QEMU_CFLAGS+=$(GPROF_CFLAGS)
diff --git a/configure b/configure
index 6f75e2e..214aabc 100755
--- a/configure
+++ b/configure
@@ -1011,6 +1011,7 @@ if test -z "$target_list" ; then
target_list="\
i386-softmmu \
x86_64-softmmu \
+alpha-softmmu \
arm-softmmu \
cris-softmmu \
lm32-softmmu \
diff --git a/default-configs/alpha-softmmu.mak
b/default-configs/alpha-softmmu.mak
new file mode 100644
index 0000000..abadcff
--- /dev/null
+++ b/default-configs/alpha-softmmu.mak
@@ -0,0 +1,9 @@
+# Default configuration for alpha-softmmu
+
+include pci.mak
+CONFIG_SERIAL=y
+CONFIG_I8254=y
+CONFIG_VGA_PCI=y
+CONFIG_IDE_CORE=y
+CONFIG_IDE_QDEV=y
+CONFIG_VMWARE_VGA=y
diff --git a/target-alpha/machine.c b/target-alpha/machine.c
new file mode 100644
index 0000000..a13b66a
--- /dev/null
+++ b/target-alpha/machine.c
@@ -0,0 +1,87 @@
+#include "hw/hw.h"
+#include "hw/boards.h"
+
+static int get_fpcr(QEMUFile *f, void *opaque, size_t size)
+{
+ CPUAlphaState *env = opaque;
+ cpu_alpha_store_fpcr(env, qemu_get_be64(f));
+ return 0;
+}
+
+static void put_fpcr(QEMUFile *f, void *opaque, size_t size)
+{
+ CPUAlphaState *env = opaque;
+ qemu_put_be64(f, cpu_alpha_load_fpcr(env));
+}
+
+static const VMStateInfo vmstate_fpcr = {
+ .name = "fpcr",
+ .get = get_fpcr,
+ .put = put_fpcr,
+};
+
+static VMStateField vmstate_cpu_fields[] = {
+ VMSTATE_UINTTL_ARRAY(ir, CPUState, 31),
+ VMSTATE_UINTTL_ARRAY(fir, CPUState, 31),
+ /* Save the architecture value of the fpcr, not the internally
+ expanded version. Since this architecture value does not
+ exist in memory to be stored, this requires a but of hoop
+ jumping. We want OFFSET=0 so that we effectively pass ENV
+ to the helper functions, and we need to fill in the name by
+ hand since there's no field of that name. */
+ {
+ .name = "fpcr",
+ .version_id = 0,
+ .size = sizeof(uint64_t),
+ .info = &vmstate_fpcr,
+ .flags = VMS_SINGLE,
+ .offset = 0
+ },
+ VMSTATE_UINTTL(pc, CPUState),
+ VMSTATE_UINTTL(unique, CPUState),
+ VMSTATE_UINTTL(lock_addr, CPUState),
+ VMSTATE_UINTTL(lock_value, CPUState),
+ /* Note that lock_st_addr is not saved; it is a temporary
+ used during the execution of the st[lq]_c insns. */
+
+ VMSTATE_UINT8(ps, CPUState),
+ VMSTATE_UINT8(intr_flag, CPUState),
+ VMSTATE_UINT8(fen, CPUState),
+ VMSTATE_UINT8(pal_mode, CPUState),
+
+ VMSTATE_UINT32(pcc_ofs, CPUState),
+
+ VMSTATE_UINTTL(trap_arg0, CPUState),
+ VMSTATE_UINTTL(trap_arg1, CPUState),
+ VMSTATE_UINTTL(trap_arg2, CPUState),
+
+ VMSTATE_UINTTL(exc_addr, CPUState),
+ VMSTATE_UINTTL(palbr, CPUState),
+ VMSTATE_UINTTL(ptbr, CPUState),
+ VMSTATE_UINTTL(vptptr, CPUState),
+ VMSTATE_UINTTL(sysval, CPUState),
+ VMSTATE_UINTTL(usp, CPUState),
+
+ VMSTATE_UINTTL_ARRAY(shadow, CPUState, 8),
+ VMSTATE_UINTTL_ARRAY(scratch, CPUState, 24),
+
+ VMSTATE_END_OF_LIST()
+};
+
+static const VMStateDescription vmstate_cpu = {
+ .name = "cpu",
+ .version_id = CPU_SAVE_VERSION,
+ .minimum_version_id = 1,
+ .minimum_version_id_old = 1,
+ .fields = vmstate_cpu_fields,
+};
+
+void cpu_save(QEMUFile *f, void *opaque)
+{
+ vmstate_save_state(f, &vmstate_cpu, opaque);
+}
+
+int cpu_load(QEMUFile *f, void *opaque, int version_id)
+{
+ return vmstate_load_state(f, &vmstate_cpu, opaque, version_id);
+}
--
1.7.4.4
- [Qemu-devel] [PATCH 00/33] Alpha system emulation, v3, Richard Henderson, 2011/04/28
- [Qemu-devel] [PATCH 04/33] pci: Export pci_to_cpu_addr., Richard Henderson, 2011/04/28
- [Qemu-devel] [PATCH 07/33] target-alpha: Enable the alpha-softmmu target.,
Richard Henderson <=
- [Qemu-devel] [PATCH 08/33] target-alpha: Tidy exception constants., Richard Henderson, 2011/04/28
- [Qemu-devel] [PATCH 06/33] target-alpha: Remove partial support for palcode emulation., Richard Henderson, 2011/04/28
- [Qemu-devel] [PATCH 10/33] target-alpha: Cleanup MMU modes., Richard Henderson, 2011/04/28
- [Qemu-devel] [PATCH 09/33] target-alpha: Rationalize internal processor registers., Richard Henderson, 2011/04/28
- [Qemu-devel] [PATCH 11/33] target-alpha: Fixup translation of PALmode instructions., Richard Henderson, 2011/04/28
- [Qemu-devel] [PATCH 13/33] target-alpha: Tidy up arithmetic exceptions., Richard Henderson, 2011/04/28
- [Qemu-devel] [PATCH 14/33] target-alpha: Use do_restore_state for arithmetic exceptions., Richard Henderson, 2011/04/28
- [Qemu-devel] [PATCH 15/33] target-alpha: Merge HW_REI and HW_RET implementations., Richard Henderson, 2011/04/28
- [Qemu-devel] [PATCH 12/33] target-alpha: Add IPRs to be used by the emulation PALcode., Richard Henderson, 2011/04/28
- [Qemu-devel] [PATCH 16/33] target-alpha: Implement do_interrupt for system mode., Richard Henderson, 2011/04/28