diff options
| author | Blue Swirl <blauwirbel@gmail.com> | 2011-11-19 11:17:58 +0000 |
|---|---|---|
| committer | Blue Swirl <blauwirbel@gmail.com> | 2011-11-19 11:17:58 +0000 |
| commit | 25cc4a768d91817bc3b4bf9b3a270c4791509cd7 (patch) | |
| tree | 78a65c66213c777fd87d68192ab82bc0f80b6d1e /tcg/tci/tcg-target.c | |
| parent | 05a86f23e5ca83348eface349429341cefb8697b (diff) | |
| parent | 326384d5b6dcea69ca44695ee807f8b50234ab71 (diff) | |
| download | focaccia-qemu-25cc4a768d91817bc3b4bf9b3a270c4791509cd7.tar.gz focaccia-qemu-25cc4a768d91817bc3b4bf9b3a270c4791509cd7.zip | |
Merge branch 's390-1.0' of git://repo.or.cz/qemu/agraf
* 's390-1.0' of git://repo.or.cz/qemu/agraf: s390x: initialize virtio dev region tcg: Use TCGReg for standard tcg-target entry points. tcg: Standardize on TCGReg as the enum for hard registers s390x: Add shutdown for TCG s390-virtio machine s390: Fix cpu shutdown for KVM s390: fix short kernel command lines s390: fix reset hypercall to reset the status s390x: implement SIGP restart and shutdown s390x: implement rrbe instruction properly s390x: update R and C bits in storage key s390x: make ipte 31-bit aware s390x: add ldeb instruction
Diffstat (limited to 'tcg/tci/tcg-target.c')
| -rw-r--r-- | tcg/tci/tcg-target.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tcg/tci/tcg-target.c b/tcg/tci/tcg-target.c index e373e2a704..942910e14b 100644 --- a/tcg/tci/tcg-target.c +++ b/tcg/tci/tcg-target.c @@ -495,7 +495,7 @@ static void tci_out_label(TCGContext *s, TCGArg arg) } } -static void tcg_out_ld(TCGContext *s, TCGType type, int ret, int arg1, +static void tcg_out_ld(TCGContext *s, TCGType type, TCGReg ret, TCGReg arg1, tcg_target_long arg2) { uint8_t *old_code_ptr = s->code_ptr; @@ -519,7 +519,7 @@ static void tcg_out_ld(TCGContext *s, TCGType type, int ret, int arg1, old_code_ptr[1] = s->code_ptr - old_code_ptr; } -static void tcg_out_mov(TCGContext *s, TCGType type, int ret, int arg) +static void tcg_out_mov(TCGContext *s, TCGType type, TCGReg ret, TCGReg arg) { uint8_t *old_code_ptr = s->code_ptr; assert(ret != arg); @@ -534,7 +534,7 @@ static void tcg_out_mov(TCGContext *s, TCGType type, int ret, int arg) } static void tcg_out_movi(TCGContext *s, TCGType type, - int t0, tcg_target_long arg) + TCGReg t0, tcg_target_long arg) { uint8_t *old_code_ptr = s->code_ptr; uint32_t arg32 = arg; @@ -834,7 +834,7 @@ static void tcg_out_op(TCGContext *s, TCGOpcode opc, const TCGArg *args, old_code_ptr[1] = s->code_ptr - old_code_ptr; } -static void tcg_out_st(TCGContext *s, TCGType type, int arg, int arg1, +static void tcg_out_st(TCGContext *s, TCGType type, TCGReg arg, TCGReg arg1, tcg_target_long arg2) { uint8_t *old_code_ptr = s->code_ptr; |