falso
/
qemu-irix
mirror of https://github.com/n64decomp/qemu-irix.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of ssh://git.qemu.org/pub/git/qemu-stable-1.0

This commit is contained in:
Justin M. Forbes 2012-01-10 14:41:17 -06:00
parent e47c212cb5 fbcf305e5a
commit 85a4ca797d
3 changed files with 31 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
ppc.ld
View File

@ -49,8 +49,20 @@ SECTIONS
.rela.sbss2 : { *(.rela.sbss2 .rela.sbss2.* .rela.gnu.linkonce.sb2.*) } .rela.sbss2 : { *(.rela.sbss2 .rela.sbss2.* .rela.gnu.linkonce.sb2.*) }
.rel.bss : { *(.rel.bss .rel.bss.* .rel.gnu.linkonce.b.*) } .rel.bss : { *(.rel.bss .rel.bss.* .rel.gnu.linkonce.b.*) }
.rela.bss : { *(.rela.bss .rela.bss.* .rela.gnu.linkonce.b.*) } .rela.bss : { *(.rela.bss .rela.bss.* .rela.gnu.linkonce.b.*) }
.rel.plt : { *(.rel.plt) } .rel.plt :
.rela.plt : { *(.rela.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 : .init :
{ {
KEEP (*(.init)) KEEP (*(.init))

16
ppc64.ld
View File

@ -54,8 +54,20 @@ SECTIONS
*(.rela.sbss2 .rela.sbss2.* .rela.gnu.linkonce.sb2.*) *(.rela.sbss2 .rela.sbss2.* .rela.gnu.linkonce.sb2.*)
*(.rela.bss .rela.bss.* .rela.gnu.linkonce.b.*) *(.rela.bss .rela.bss.* .rela.gnu.linkonce.b.*)
} }
.rel.plt : { *(.rel.plt) } .rel.plt :
.rela.plt : { *(.rela.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) } .rela.tocbss : { *(.rela.tocbss) }
.init : .init :
{ {

14
target-sh4/translate.c
View File

@ -1652,18 +1652,10 @@ static void _decode_opc(DisasContext * ctx)
} }
return; return;
case 0x00a3: /* ocbp @Rn */ 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 */ case 0x00b3: /* ocbwb @Rn */
{ /* These instructions are supposed to do nothing in case of
TCGv dummy = tcg_temp_new(); a cache miss. Given that we only partially emulate caches
tcg_gen_qemu_ld32s(dummy, REG(B11_8), ctx->memidx); it is safe to simply ignore them. */
tcg_temp_free(dummy);
}
return; return;
case 0x0083: /* pref @Rn */ case 0x0083: /* pref @Rn */
return; return;