diff options
| author | tma <tma@edf5b092-35ff-0310-97b2-ce42778d08ea> | 2005-09-26 13:47:59 +0000 |
|---|---|---|
| committer | tma <tma@edf5b092-35ff-0310-97b2-ce42778d08ea> | 2005-09-26 13:47:59 +0000 |
| commit | 9219cdaa68b921443551427e49361d814bcd9531 (patch) | |
| tree | 136c1d560edb8a118df9b75b1a2fbda529eb4fae /code | |
| parent | a56d9f49ad0c5dc499a9c622a74721af0fc70645 (diff) | |
| download | ioquake3-aero-9219cdaa68b921443551427e49361d814bcd9531.tar.gz ioquake3-aero-9219cdaa68b921443551427e49361d814bcd9531.zip | |
* Fix to broken win32 fix patch
git-svn-id: svn://svn.icculus.org/quake3/trunk@110 edf5b092-35ff-0310-97b2-ce42778d08ea
Diffstat (limited to 'code')
| -rw-r--r-- | code/qcommon/vm_x86.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/code/qcommon/vm_x86.c b/code/qcommon/vm_x86.c index a1e3317..a86e667 100644 --- a/code/qcommon/vm_x86.c +++ b/code/qcommon/vm_x86.c @@ -79,8 +79,8 @@ int qftol0F7F( void ); static int ftolPtr = (int)qftol0F7F; #endif // FTOL_PTR -void AsmCall( void ); -static int asmCallPtr = (int)AsmCall; +void doAsmCall( void ); +static int asmCallPtr = (int)doAsmCall; #endif // !_WIN32 @@ -197,8 +197,11 @@ void callAsmCall(void) currentVM = savedVM; } +// Note the C space function AsmCall is never actually called, and is in fact +// arbitarily named (though this is not true for the MSC version). When a vm +// makes a system call, control jumps straight to the doAsmCall label. void AsmCall( void ) { - asm( CMANG(AsmCall) ": \n\t" \ + asm( CMANG(doAsmCall) ": \n\t" \ " movl (%%edi),%%eax \n\t" \ " subl $4,%%edi \n\t" \ " orl %%eax,%%eax \n\t" \ |