diff options
author | Justin M. Forbes <jforbes@redhat.com> | 2012-01-10 14:41:17 -0600 |
---|---|---|
committer | Justin M. Forbes <jforbes@redhat.com> | 2012-01-10 14:41:17 -0600 |
commit | 85a4ca797dbe25f27df0a66aa4df1cab63245cd3 (patch) | |
tree | c8f2d52166fd71d9c6ab7289d2f11c435ad776a7 | |
parent | e47c212cb5af148ab6d9dcf49bc0e054fe9c2e1d (diff) | |
parent | fbcf305e5adc310e6383d4ec5e844f3f8d072116 (diff) |
Merge branch 'master' of ssh://git.qemu.org/pub/git/qemu-stable-1.0
-rw-r--r-- | ppc.ld | 16 | ||||
-rw-r--r-- | ppc64.ld | 16 | ||||
-rw-r--r-- | target-sh4/translate.c | 14 |
3 files changed, 31 insertions, 15 deletions
@@ -49,8 +49,20 @@ SECTIONS .rela.sbss2 : { *(.rela.sbss2 .rela.sbss2.* .rela.gnu.linkonce.sb2.*) } .rel.bss : { *(.rel.bss .rel.bss.* .rel.gnu.linkonce.b.*) } .rela.bss : { *(.rela.bss .rela.bss.* .rela.gnu.linkonce.b.*) } - .rel.plt : { *(.rel.plt) } - .rela.plt : { *(.rela.plt) } + .rel.plt : + { + *(.rel.plt) + PROVIDE (__rel_iplt_start = .); + *(.rel.iplt) + PROVIDE (__rel_iplt_end = .); + } + .rela.plt : + { + *(.rela.plt) + PROVIDE (__rela_iplt_start = .); + *(.rela.iplt) + PROVIDE (__rela_iplt_end = .); + } .init : { KEEP (*(.init)) @@ -54,8 +54,20 @@ SECTIONS *(.rela.sbss2 .rela.sbss2.* .rela.gnu.linkonce.sb2.*) *(.rela.bss .rela.bss.* .rela.gnu.linkonce.b.*) } - .rel.plt : { *(.rel.plt) } - .rela.plt : { *(.rela.plt) } + .rel.plt : + { + *(.rel.plt) + PROVIDE (__rel_iplt_start = .); + *(.rel.iplt) + PROVIDE (__rel_iplt_end = .); + } + .rela.plt : + { + *(.rela.plt) + PROVIDE (__rela_iplt_start = .); + *(.rela.iplt) + PROVIDE (__rela_iplt_end = .); + } .rela.tocbss : { *(.rela.tocbss) } .init : { diff --git a/target-sh4/translate.c b/target-sh4/translate.c index bad357772..e04a6e0f5 100644 --- a/target-sh4/translate.c +++ b/target-sh4/translate.c @@ -1652,18 +1652,10 @@ static void _decode_opc(DisasContext * ctx) } return; case 0x00a3: /* ocbp @Rn */ - { - TCGv dummy = tcg_temp_new(); - tcg_gen_qemu_ld32s(dummy, REG(B11_8), ctx->memidx); - tcg_temp_free(dummy); - } - return; case 0x00b3: /* ocbwb @Rn */ - { - TCGv dummy = tcg_temp_new(); - tcg_gen_qemu_ld32s(dummy, REG(B11_8), ctx->memidx); - tcg_temp_free(dummy); - } + /* These instructions are supposed to do nothing in case of + a cache miss. Given that we only partially emulate caches + it is safe to simply ignore them. */ return; case 0x0083: /* pref @Rn */ return; |