[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 19/24] alpha ld helpers now directly return the valu
From: |
Tristan Gingold |
Subject: |
[Qemu-devel] [PATCH 19/24] alpha ld helpers now directly return the value. |
Date: |
Fri, 13 Mar 2009 15:20:38 +0100 |
Remove _kernel helpers as they can be directly generated.
Replace ld/st_raw with _phys (bug fix).
Signed-off-by: Tristan Gingold <address@hidden>
---
target-alpha/helper.h | 14 +++++-------
target-alpha/op_helper.c | 50 ++++++++++++++++++++-------------------------
2 files changed, 28 insertions(+), 36 deletions(-)
diff --git a/target-alpha/helper.h b/target-alpha/helper.h
index 4c4855d..4c37851 100644
--- a/target-alpha/helper.h
+++ b/target-alpha/helper.h
@@ -116,14 +116,12 @@ DEF_HELPER_0(restore_mode, void)
DEF_HELPER_1(ld_virt_to_phys, i64, i64)
DEF_HELPER_1(st_virt_to_phys, i64, i64)
-DEF_HELPER_2(ldl_raw, void, i64, i64)
-DEF_HELPER_2(ldq_raw, void, i64, i64)
-DEF_HELPER_2(ldl_l_raw, void, i64, i64)
-DEF_HELPER_2(ldq_l_raw, void, i64, i64)
-DEF_HELPER_2(ldl_kernel, void, i64, i64)
-DEF_HELPER_2(ldq_kernel, void, i64, i64)
-DEF_HELPER_2(ldl_data, void, i64, i64)
-DEF_HELPER_2(ldq_data, void, i64, i64)
+DEF_HELPER_1(ldl_raw, i32, i64)
+DEF_HELPER_1(ldq_raw, i64, i64)
+DEF_HELPER_1(ldl_l_raw, i32, i64)
+DEF_HELPER_1(ldq_l_raw, i64, i64)
+DEF_HELPER_1(ldl_data, i32, i64)
+DEF_HELPER_1(ldq_data, i64, i64)
DEF_HELPER_2(stl_raw, void, i64, i64)
DEF_HELPER_2(stq_raw, void, i64, i64)
DEF_HELPER_2(stl_c_raw, i64, i64, i64)
diff --git a/target-alpha/op_helper.c b/target-alpha/op_helper.c
index 4b6ada7..bea11cb 100644
--- a/target-alpha/op_helper.c
+++ b/target-alpha/op_helper.c
@@ -1091,56 +1091,50 @@ uint64_t helper_st_virt_to_phys (uint64_t virtaddr)
return physaddr;
}
-void helper_ldl_raw(uint64_t t0, uint64_t t1)
+uint32_t helper_ldl_raw(uint64_t addr)
{
- ldl_raw(t1, t0);
+ return ldl_phys(addr);
}
-void helper_ldq_raw(uint64_t t0, uint64_t t1)
+uint64_t helper_ldq_raw(uint64_t addr)
{
- ldq_raw(t1, t0);
+ return ldq_phys(addr);
}
-void helper_ldl_l_raw(uint64_t t0, uint64_t t1)
+uint32_t helper_ldl_l_raw(uint64_t addr)
{
- env->lock = t1;
- ldl_raw(t1, t0);
+ env->lock = addr;
+ return ldl_phys(addr);
}
-void helper_ldq_l_raw(uint64_t t0, uint64_t t1)
+uint64_t helper_ldq_l_raw(uint64_t addr)
{
- env->lock = t1;
- ldl_raw(t1, t0);
+ env->lock = addr;
+ return ldl_raw(addr);
}
-void helper_ldl_kernel(uint64_t t0, uint64_t t1)
+uint32_t helper_ldl_data(uint64_t addr)
{
- ldl_kernel(t1, t0);
+ /* FIXME: ldl_data won't work in case of fault */
+ cpu_abort(env, "ldl_data not implemented\n");
+ return ldl_data(addr);
}
-void helper_ldq_kernel(uint64_t t0, uint64_t t1)
+uint64_t helper_ldq_data(uint64_t addr)
{
- ldq_kernel(t1, t0);
-}
-
-void helper_ldl_data(uint64_t t0, uint64_t t1)
-{
- ldl_data(t1, t0);
-}
-
-void helper_ldq_data(uint64_t t0, uint64_t t1)
-{
- ldq_data(t1, t0);
+ /* FIXME: ldq_data won't work in case of fault */
+ cpu_abort(env, "ldq_data not implemented\n");
+ return ldq_data(addr);
}
void helper_stl_raw(uint64_t t0, uint64_t t1)
{
- stl_raw(t1, t0);
+ stl_phys(t1, t0);
}
void helper_stq_raw(uint64_t t0, uint64_t t1)
{
- stq_raw(t1, t0);
+ stq_phys(t1, t0);
}
uint64_t helper_stl_c_raw(uint64_t t0, uint64_t t1)
@@ -1148,7 +1142,7 @@ uint64_t helper_stl_c_raw(uint64_t t0, uint64_t t1)
uint64_t ret;
if (t1 == env->lock) {
- stl_raw(t1, t0);
+ stl_phys(t1, t0);
ret = 0;
} else
ret = 1;
@@ -1163,7 +1157,7 @@ uint64_t helper_stq_c_raw(uint64_t t0, uint64_t t1)
uint64_t ret;
if (t1 == env->lock) {
- stq_raw(t1, t0);
+ stq_phys(t1, t0);
ret = 0;
} else
ret = 1;
--
1.6.2
- [Qemu-devel] [PATCH 09/24] Split cpu_mmu_index into cpu_mmu_index_data and cpu_mmu_index_code., (continued)
- [Qemu-devel] [PATCH 09/24] Split cpu_mmu_index into cpu_mmu_index_data and cpu_mmu_index_code., Tristan Gingold, 2009/03/13
- [Qemu-devel] [PATCH 10/24] Add square wave output support., Tristan Gingold, 2009/03/13
- [Qemu-devel] [PATCH 11/24] Add ali1543 super IO pci device., Tristan Gingold, 2009/03/13
- [Qemu-devel] [PATCH 12/24] Add 21272 chipset (memory and pci controller for alpha), Tristan Gingold, 2009/03/13
- [Qemu-devel] [PATCH 13/24] Add target-alpha/machine.c with es40 machine emulation., Tristan Gingold, 2009/03/13
- [Qemu-devel] [PATCH 14/24] Move softmmu_helper.h from exec.h to op_helper.c on alpha., Tristan Gingold, 2009/03/13
- [Qemu-devel] [PATCH 15/24] Document which IPR are used by 21264., Tristan Gingold, 2009/03/13
- [Qemu-devel] [PATCH 16/24] tb_flush helper should flush the tb (and not the tlb)., Tristan Gingold, 2009/03/13
- [Qemu-devel] [PATCH 17/24] Add instruction name in comments for hw_ld opcode., Tristan Gingold, 2009/03/13
- [Qemu-devel] [PATCH 18/24] Remove PALCODE_ declarations (unused)., Tristan Gingold, 2009/03/13
- [Qemu-devel] [PATCH 19/24] alpha ld helpers now directly return the value.,
Tristan Gingold <=
- [Qemu-devel] [PATCH 20/24] Add alpha_cpu_list., Tristan Gingold, 2009/03/13
- [Qemu-devel] [PATCH 21/24] Alpha: lower parent irq when irq is lowered., Tristan Gingold, 2009/03/13
- [Qemu-devel] [PATCH 22/24] Move linux-user pal emulation to linux-user/, Tristan Gingold, 2009/03/13
- [Qemu-devel] [PATCH 23/24] Correctly decode hw_ld/hw_st opcodes for all alpha implementations., Tristan Gingold, 2009/03/13
- [Qemu-devel] [PATCH 24/24] Add full emulation for 21264., Tristan Gingold, 2009/03/13
- Re: [Qemu-devel] [PATCH 20/24] Add alpha_cpu_list., Blue Swirl, 2009/03/13
- Re: [Qemu-devel] [PATCH 20/24] Add alpha_cpu_list., Tristan Gingold, 2009/03/16
- Re: [Qemu-devel] [PATCH 13/24] Add target-alpha/machine.c with es40 machine emulation., Blue Swirl, 2009/03/13
- Re: [Qemu-devel] [PATCH 13/24] Add target-alpha/machine.c with es40 machine emulation., Tristan Gingold, 2009/03/16
- Re: [Qemu-devel] [PATCH 09/24] Split cpu_mmu_index into cpu_mmu_index_data and cpu_mmu_index_code., Blue Swirl, 2009/03/13