system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-09-14 18:15:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use r2 instead of r13 for TLS, since r13 is used in the ELF32 PPC

Browse source 
ABI.
This commit is contained in:
Marcus Meissner 2002-08-20 00:00:35 +00:00 committed by Alexandre Julliard
parent 4d54db752c
commit 2456149860
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/winnt.h
View file

@ -2332,7 +2332,7 @@ extern inline struct _TEB * WINAPI NtCurrentTeb(void);
extern inline struct _TEB * WINAPI NtCurrentTeb(void) extern inline struct _TEB * WINAPI NtCurrentTeb(void)
{ {
struct _TEB *teb; struct _TEB *teb;
__asm__("\tmr %0, 13" : "=r" (teb)); __asm__("\tmr %0, 2" : "=r" (teb));
return teb; return teb;
} }
#else #else

4
scheduler/sysdeps.c
View file

@ -91,7 +91,7 @@ void SYSDEPS_SetCurThread( TEB *teb )
wine_set_fs( teb->teb_sel ); wine_set_fs( teb->teb_sel );
#elif defined(__powerpc__) #elif defined(__powerpc__)
/* On PowerPC, the current TEB is in the gpr13 register */ /* On PowerPC, the current TEB is in the gpr13 register */
__asm__ __volatile__("mr 13, %0" : : "r" (teb)); __asm__ __volatile__("mr 2, %0" : : "r" (teb));
#elif defined(HAVE__LWP_CREATE) #elif defined(HAVE__LWP_CREATE)
/* On non-i386 Solaris, we use the LWP private pointer */ /* On non-i386 Solaris, we use the LWP private pointer */
_lwp_setprivate( teb ); _lwp_setprivate( teb );
@ -343,7 +343,7 @@ struct _TEB * WINAPI NtCurrentTeb(void)
return (struct _TEB *)_lwp_getprivate(); return (struct _TEB *)_lwp_getprivate();
} }
#elif defined(__powerpc__) #elif defined(__powerpc__)
__ASM_GLOBAL_FUNC( NtCurrentTeb, "\n\tmr 3,13\n\tblr" ); __ASM_GLOBAL_FUNC( NtCurrentTeb, "\n\tmr 3,2\n\tblr" );
#else #else
# error NtCurrentTeb not defined for this architecture # error NtCurrentTeb not defined for this architecture
#endif /* __i386__ */ #endif /* __i386__ */