marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

winebuild: Fix import stub on ppc. 

The address calculation was wrong, as the addition of the lower 16 bits
is a signed addition, so if bit 15 is set, the upper 16 bits need to be
incremented by one (so the hi portion of the symbol always references
the symbol + 0x8000).
oldstable
Simon Richter 2008-05-31 10:51:01 +02:00 committed by Alexandre Julliard
parent d1e277fb70
commit 238e1868b2
1 changed files with 8 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
tools/winebuild/import.c
View File

@ -699,30 +699,20 @@ static void output_import_thunk( const char *name, const char *table, int pos )
output( "\tjmp $31,($0)\n" );
break;
case CPU_POWERPC:
output( "\taddi %s, %s, -0x4\n", ppc_reg(1), ppc_reg(1) );
output( "\tstw %s, 0(%s)\n", ppc_reg(9), ppc_reg(1) );
output( "\taddi %s, %s, -0x4\n", ppc_reg(1), ppc_reg(1) );
output( "\tstw %s, 0(%s)\n", ppc_reg(8), ppc_reg(1) );
output( "\taddi %s, %s, -0x4\n", ppc_reg(1), ppc_reg(1) );
output( "\tstw %s, 0(%s)\n", ppc_reg(7), ppc_reg(1) );
output( "\tmr %s, %s\n", ppc_reg(0), ppc_reg(31) );
if (target_platform == PLATFORM_APPLE)
{
output( "\tlis %s, ha16(%s+%d)\n", ppc_reg(9), table, pos );
output( "\tla %s, lo16(%s+%d)(%s)\n", ppc_reg(8), table, pos, ppc_reg(9) );
output( "\tlis %s, ha16(%s+%d+32768)\n", ppc_reg(31), table, pos );
output( "\tla %s, lo16(%s+%d)(%s)\n", ppc_reg(31), table, pos, ppc_reg(31) );
}
else
{
output( "\tlis %s, (%s+%d)@h\n", ppc_reg(9), table, pos );
output( "\tla %s, (%s+%d)@l(%s)\n", ppc_reg(8), table, pos, ppc_reg(9) );
output( "\tlis %s, (%s+%d+32768)@h\n", ppc_reg(31), table, pos );
output( "\tla %s, (%s+%d)@l(%s)\n", ppc_reg(31), table, pos, ppc_reg(31) );
}
output( "\tlwz %s, 0(%s)\n", ppc_reg(7), ppc_reg(8) );
output( "\tmtctr %s\n", ppc_reg(7) );
output( "\tlwz %s, 0(%s)\n", ppc_reg(7), ppc_reg(1) );
output( "\taddi %s, %s, 0x4\n", ppc_reg(1), ppc_reg(1) );
output( "\tlwz %s, 0(%s)\n", ppc_reg(8), ppc_reg(1) );
output( "\taddi %s, %s, 0x4\n", ppc_reg(1), ppc_reg(1) );
output( "\tlwz %s, 0(%s)\n", ppc_reg(9), ppc_reg(1) );
output( "\taddi %s, %s, 0x4\n", ppc_reg(1), ppc_reg(1) );
output( "\tlwz %s, 0(%s)\n", ppc_reg(31), ppc_reg(31) );
output( "\tmtctr %s\n", ppc_reg(31) );
output( "\tmr %s, %s\n", ppc_reg(31), ppc_reg(0) );
output( "\tbctr\n" );
break;
}