ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Anthony Liguori 2013-07-22 10:13:27 -05:00
parent 90c66f587c b957a1b03c
commit 293706dd68
8 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitmodules vendored
View File

@ -15,7 +15,7 @@
url = git://git.qemu.org/openbios.git url = git://git.qemu.org/openbios.git
[submodule "roms/qemu-palcode"] [submodule "roms/qemu-palcode"]
path = 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"] [submodule "roms/sgabios"]
path = roms/sgabios path = roms/sgabios
url = git://git.qemu.org/sgabios.git url = git://git.qemu.org/sgabios.git

2
hw/alpha/typhoon.c
View File

@ -693,7 +693,7 @@ PCIBus *typhoon_init(ram_addr_t ram_size, ISABus **isa_bus,
AlphaCPU *cpu = cpus[i]; AlphaCPU *cpu = cpus[i];
s->cchip.cpu[i] = cpu; s->cchip.cpu[i] = cpu;
if (cpu != NULL) { if (cpu != NULL) {
cpu->alarm_timer = qemu_new_timer_ns(rtc_clock, cpu->alarm_timer = qemu_new_timer_ns(vm_clock,
typhoon_alarm_timer, typhoon_alarm_timer,
(void *)((uintptr_t)s + i)); (void *)((uintptr_t)s + i));
} }

2
pc-bios/README
View File

@ -40,4 +40,4 @@
git://repo.or.cz/s390-tools.git git://repo.or.cz/s390-tools.git
- The sources for the Alpha palcode image is available from: - The sources for the Alpha palcode image is available from:
git://repo.or.cz/qemu-palcode.git git://github.com/rth7680/qemu-palcode.git

BIN
pc-bios/palcode-clipper
View File

Binary file not shown.

2
roms/qemu-palcode

@ -1 +1 @@
Subproject commit 7abb12f60eb3069019e9497e193733d77d8f0722 Subproject commit c87a92639b28ac42bc8f6c67443543b405dc479b

3
target-alpha/helper.h
View File

@ -114,7 +114,8 @@ DEF_HELPER_FLAGS_2(tbis, TCG_CALL_NO_RWG, void, env, i64)
DEF_HELPER_1(halt, void, 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) DEF_HELPER_FLAGS_2(set_alarm, TCG_CALL_NO_RWG, void, env, i64)
#endif #endif

7
target-alpha/sys_helper.c
View File

@ -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); return qemu_get_clock_ns(rtc_clock);
} }

12
target-alpha/translate.c
View File

@ -1634,15 +1634,19 @@ static ExitStatus gen_mfpr(int ra, int regno)
return NO_EXIT; return NO_EXIT;
} }
if (regno == 250) { /* Special help for VMTIME and WALLTIME. */
/* WALL_TIME */ if (regno == 250 || regno == 249) {
void (*helper)(TCGv) = gen_helper_get_walltime;
if (regno == 249) {
helper = gen_helper_get_vmtime;
}
if (use_icount) { if (use_icount) {
gen_io_start(); gen_io_start();
gen_helper_get_time(cpu_ir[ra]); helper(cpu_ir[ra]);
gen_io_end(); gen_io_end();
return EXIT_PC_STALE; return EXIT_PC_STALE;
} else { } else {
gen_helper_get_time(cpu_ir[ra]); helper(cpu_ir[ra]);
return NO_EXIT; return NO_EXIT;
} }
} }