aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnthony Liguori <aliguori@us.ibm.com>2013-07-22 10:13:27 -0500
committerAnthony Liguori <aliguori@us.ibm.com>2013-07-22 10:13:27 -0500
commit293706dd682f578b457d052988cf3c20b4eab82d (patch)
tree1471026276e0d29d2161b80551924b3394d8c38e
parent90c66f587c8d020a642d3c9376f9102c16f2234e (diff)
parentb957a1b03cfd56134519ebc01ba8fe1b166c0c84 (diff)
downloadqemu-293706dd682f578b457d052988cf3c20b4eab82d.zip
qemu-293706dd682f578b457d052988cf3c20b4eab82d.tar.gz
qemu-293706dd682f578b457d052988cf3c20b4eab82d.tar.bz2
Merge remote-tracking branch 'rth/axp-next' into staging
# By Richard Henderson # Via Richard Henderson * rth/axp-next: pc-bios: Update palcode-clipper target-alpha: Move alarm to vm_clock Message-id: 1374161033-11449-1-git-send-email-rth@twiddle.net Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
-rw-r--r--.gitmodules2
-rw-r--r--hw/alpha/typhoon.c2
-rw-r--r--pc-bios/README2
-rwxr-xr-xpc-bios/palcode-clipperbin185703 -> 133550 bytes
m---------roms/qemu-palcode0
-rw-r--r--target-alpha/helper.h3
-rw-r--r--target-alpha/sys_helper.c7
-rw-r--r--target-alpha/translate.c12
8 files changed, 19 insertions, 9 deletions
diff --git a/.gitmodules b/.gitmodules
index b426ea6..d7e3f3c 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -15,7 +15,7 @@
url = git://git.qemu.org/openbios.git
[submodule "roms/qemu-palcode"]
path = roms/qemu-palcode
- url = git://repo.or.cz/qemu-palcode.git
+ url = git://github.com/rth7680/qemu-palcode.git
[submodule "roms/sgabios"]
path = roms/sgabios
url = git://git.qemu.org/sgabios.git
diff --git a/hw/alpha/typhoon.c b/hw/alpha/typhoon.c
index 3d7a1cd..b7fb044 100644
--- a/hw/alpha/typhoon.c
+++ b/hw/alpha/typhoon.c
@@ -693,7 +693,7 @@ PCIBus *typhoon_init(ram_addr_t ram_size, ISABus **isa_bus,
AlphaCPU *cpu = cpus[i];
s->cchip.cpu[i] = cpu;
if (cpu != NULL) {
- cpu->alarm_timer = qemu_new_timer_ns(rtc_clock,
+ cpu->alarm_timer = qemu_new_timer_ns(vm_clock,
typhoon_alarm_timer,
(void *)((uintptr_t)s + i));
}
diff --git a/pc-bios/README b/pc-bios/README
index 030d92a..53b5289 100644
--- a/pc-bios/README
+++ b/pc-bios/README
@@ -40,4 +40,4 @@
git://repo.or.cz/s390-tools.git
- The sources for the Alpha palcode image is available from:
- git://repo.or.cz/qemu-palcode.git
+ git://github.com/rth7680/qemu-palcode.git
diff --git a/pc-bios/palcode-clipper b/pc-bios/palcode-clipper
index a92372c..9956340 100755
--- a/pc-bios/palcode-clipper
+++ b/pc-bios/palcode-clipper
Binary files differ
diff --git a/roms/qemu-palcode b/roms/qemu-palcode
-Subproject 7abb12f60eb3069019e9497e193733d77d8f072
+Subproject c87a92639b28ac42bc8f6c67443543b405dc479
diff --git a/target-alpha/helper.h b/target-alpha/helper.h
index 3321fde..0e425cf 100644
--- a/target-alpha/helper.h
+++ b/target-alpha/helper.h
@@ -114,7 +114,8 @@ DEF_HELPER_FLAGS_2(tbis, TCG_CALL_NO_RWG, void, env, i64)
DEF_HELPER_1(halt, void, i64);
-DEF_HELPER_FLAGS_0(get_time, TCG_CALL_NO_RWG, i64)
+DEF_HELPER_FLAGS_0(get_vmtime, TCG_CALL_NO_RWG, i64)
+DEF_HELPER_FLAGS_0(get_walltime, TCG_CALL_NO_RWG, i64)
DEF_HELPER_FLAGS_2(set_alarm, TCG_CALL_NO_RWG, void, env, i64)
#endif
diff --git a/target-alpha/sys_helper.c b/target-alpha/sys_helper.c
index 339501a..bd94597 100644
--- a/target-alpha/sys_helper.c
+++ b/target-alpha/sys_helper.c
@@ -70,7 +70,12 @@ void helper_halt(uint64_t restart)
}
}
-uint64_t helper_get_time(void)
+uint64_t helper_get_vmtime(void)
+{
+ return qemu_get_clock_ns(vm_clock);
+}
+
+uint64_t helper_get_walltime(void)
{
return qemu_get_clock_ns(rtc_clock);
}
diff --git a/target-alpha/translate.c b/target-alpha/translate.c
index dd7f0fb..5558b72 100644
--- a/target-alpha/translate.c
+++ b/target-alpha/translate.c
@@ -1634,15 +1634,19 @@ static ExitStatus gen_mfpr(int ra, int regno)
return NO_EXIT;
}
- if (regno == 250) {
- /* WALL_TIME */
+ /* Special help for VMTIME and WALLTIME. */
+ if (regno == 250 || regno == 249) {
+ void (*helper)(TCGv) = gen_helper_get_walltime;
+ if (regno == 249) {
+ helper = gen_helper_get_vmtime;
+ }
if (use_icount) {
gen_io_start();
- gen_helper_get_time(cpu_ir[ra]);
+ helper(cpu_ir[ra]);
gen_io_end();
return EXIT_PC_STALE;
} else {
- gen_helper_get_time(cpu_ir[ra]);
+ helper(cpu_ir[ra]);
return NO_EXIT;
}
}