mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-08-08 02:03:56 -06:00
Merge branch 'trivial-patches' of git://github.com/stefanha/qemu
* 'trivial-patches' of git://github.com/stefanha/qemu: versatilepb: Use symbolic indices for ARM PIC qdev: kill bogus comment qemu-barrier: Fix compiler version check for future gcc versions hw: Add missing 'static' attribute for QEMUMachine cleanup useless return sentence qemu-sockets: Fix compiler warning (regression for MinGW) vnc: Fix spelling (hellmen -> hellman) in comment slirp: Fix spelling in comment (enought -> enough, insure -> ensure) tcg/arm: Use tcg_out_mov_reg rather than inline equivalent code cpu: Add missing 'static' attribute to qemu_global_mutex configure: Support empty target list (--target-list=) hw: Fix return value check for bdrv_read, bdrv_write
This commit is contained in:
commit
048d3612a5
54 changed files with 56 additions and 111 deletions
|
@ -1197,20 +1197,11 @@ static inline void tcg_out_qemu_ld(TCGContext *s, const TCGArg *args, int opc)
|
|||
case 1:
|
||||
case 2:
|
||||
default:
|
||||
if (data_reg != TCG_REG_R0) {
|
||||
tcg_out_dat_reg(s, COND_AL, ARITH_MOV,
|
||||
data_reg, 0, TCG_REG_R0, SHIFT_IMM_LSL(0));
|
||||
}
|
||||
tcg_out_mov_reg(s, COND_AL, data_reg, TCG_REG_R0);
|
||||
break;
|
||||
case 3:
|
||||
if (data_reg != TCG_REG_R0) {
|
||||
tcg_out_dat_reg(s, COND_AL, ARITH_MOV,
|
||||
data_reg, 0, TCG_REG_R0, SHIFT_IMM_LSL(0));
|
||||
}
|
||||
if (data_reg2 != TCG_REG_R1) {
|
||||
tcg_out_dat_reg(s, COND_AL, ARITH_MOV,
|
||||
data_reg2, 0, TCG_REG_R1, SHIFT_IMM_LSL(0));
|
||||
}
|
||||
tcg_out_mov_reg(s, COND_AL, data_reg, TCG_REG_R0);
|
||||
tcg_out_mov_reg(s, COND_AL, data_reg2, TCG_REG_R1);
|
||||
break;
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue