okseby/Quake-III-Arena
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* Tidied up the makefile, mostly for whitespace

Browse source 
* Removed the q3static target
* Ported the nasm asm to gas asm, thus removing the nasm dependancy
This commit is contained in:
Tim Angus 2005-09-23 01:59:42 +00:00
parent fcaf343d7f
commit fa9b864abe
5 changed files with 1200 additions and 1766 deletions
Download patch file Download diff file Expand all files Collapse all files

2455
code/unix/Makefile
View file

File diff suppressed because it is too large Load diff

151
code/unix/ftol.nasm
View file

@ -1,151 +0,0 @@
;===========================================================================
;Copyright (C) 1999-2005 Id Software, Inc.
;
;This file is part of Quake III Arena source code.
;
;Quake III Arena source code is free software; you can redistribute it
;and/or modify it under the terms of the GNU General Public License as
;published by the Free Software Foundation; either version 2 of the License,
;or (at your option) any later version.
;
;Quake III Arena source code is distributed in the hope that it will be
;useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
;MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
;GNU General Public License for more details.
;
;You should have received a copy of the GNU General Public License
;along with Foobar; if not, write to the Free Software
;Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
;===========================================================================
;
; qftol -- fast floating point to long conversion.
;
segment .data
temp dd 0.0
fpucw dd 0
; Precision Control Field , 2 bits / 0x0300
; PC24 0x0000 Single precision (24 bits).
; PC53 0x0200 Double precision (53 bits).
; PC64 0x0300 Extended precision (64 bits).
; Rounding Control Field, 2 bits / 0x0C00
; RCN 0x0000 Rounding to nearest (even).
; RCD 0x0400 Rounding down (directed, minus).
; RCU 0x0800 Rounding up (directed plus).
; RC0 0x0C00 Rounding towards zero (chop mode).
; rounding towards nearest (even)
cw027F dd 0x027F ; double precision
cw037F dd 0x037F ; extended precision
; rounding towards zero (chop mode)
cw0E7F dd 0x0E7F ; double precision
cw0F7F dd 0x0F7F ; extended precision
segment .text
;
; int qftol( void ) - default control word
;
global qftol
qftol:
fistp dword [temp]
mov eax, [temp]
ret
;
; int qftol027F( void ) - DirectX FPU
;
global qftol027F
qftol027F:
fnstcw [fpucw]
fldcw [cw027F]
fistp dword [temp]
fldcw [fpucw]
mov eax, [temp]
ret
;
; int qftol037F( void ) - Linux FPU
;
global qftol037F
qftol037F:
fnstcw [fpucw]
fldcw [cw037F]
fistp dword [temp]
fldcw [fpucw]
mov eax, [temp]
ret
;
; int qftol0F7F( void ) - ANSI
;
global qftol0F7F
qftol0F7F:
fnstcw [fpucw]
fldcw [cw0F7F]
fistp dword [temp]
fldcw [fpucw]
mov eax, [temp]
ret
;
; int qftol0E7F( void )
;
global qftol0E7F
qftol0E7F:
fnstcw [fpucw]
fldcw [cw0E7F]
fistp dword [temp]
fldcw [fpucw]
mov eax, [temp]
ret
;
; long Q_ftol( float q )
;
global Q_ftol
Q_ftol:
fld dword [esp+4]
fistp dword [temp]
mov eax, [temp]
ret
;
; long qftol0F7F( float q ) - Linux FPU
;
global Q_ftol0F7F
Q_ftol0F7F:
fnstcw [fpucw]
fld dword [esp+4]
fldcw [cw0F7F]
fistp dword [temp]
fldcw [fpucw]
mov eax, [temp]
ret

161
code/unix/ftola.s Normal file
View file

@ -0,0 +1,161 @@
/*
===========================================================================
Copyright (C) 1999-2005 Id Software, Inc.
This file is part of Quake III Arena source code.
Quake III Arena source code is free software; you can redistribute it
and/or modify it under the terms of the GNU General Public License as
published by the Free Software Foundation; either version 2 of the License,
or (at your option) any later version.
Quake III Arena source code is distributed in the hope that it will be
useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with Foobar; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
===========================================================================
*/
//
// qftol -- fast floating point to long conversion.
//
// 23/09/05 Ported to gas by intel2gas, best supporting actor Tim Angus
// <tim@ngus.net>
#define GLQUAKE 1 // don't include unneeded defs
#include "qasm.h"
#ifdef id386
.data
temp: .float 0.0
fpucw: .long 0
// Precision Control Field , 2 bits / 0x0300
// PC24 0x0000 Single precision (24 bits).
// PC53 0x0200 Double precision (53 bits).
// PC64 0x0300 Extended precision (64 bits).
// Rounding Control Field, 2 bits / 0x0C00
// RCN 0x0000 Rounding to nearest (even).
// RCD 0x0400 Rounding down (directed, minus).
// RCU 0x0800 Rounding up (directed plus).
// RC0 0x0C00 Rounding towards zero (chop mode).
// rounding towards nearest (even)
cw027F: .long 0x027F
cw037F: .long 0x037F
// rounding towards zero (chop mode)
cw0E7F: .long 0x0E7F
cw0F7F: .long 0x0F7F
.text
//
// int qftol( void ) - default control word
//
.global C(qftol)
C(qftol):
fistpl temp
movl temp,%eax
ret
//
// int qftol027F( void ) - DirectX FPU
//
.global C(qftol027F)
C(qftol027F):
fnstcw fpucw
fldcw cw027F
fistpl temp
fldcw fpucw
movl temp,%eax
ret
//
// int qftol037F( void ) - Linux FPU
//
.global C(qftol037F)
C(qftol037F):
fnstcw fpucw
fldcw cw037F
fistpl temp
fldcw fpucw
movl temp,%eax
ret
//
// int qftol0F7F( void ) - ANSI
//
.global C(qftol0F7F)
C(qftol0F7F):
fnstcw fpucw
fldcw cw0F7F
fistpl temp
fldcw fpucw
movl temp,%eax
ret
//
// int qftol0E7F( void )
//
.global C(qftol0E7F)
C(qftol0E7F):
fnstcw fpucw
fldcw cw0E7F
fistpl temp
fldcw fpucw
movl temp,%eax
ret
//
// long Q_ftol( float q )
//
.global C(Q_ftol)
C(Q_ftol):
flds 4(%esp)
fistpl temp
movl temp,%eax
ret
//
// long qftol0F7F( float q ) - Linux FPU
//
.global C(Q_ftol0F7F)
C(Q_ftol0F7F):
fnstcw fpucw
flds 4(%esp)
fldcw cw0F7F
fistpl temp
fldcw fpucw
movl temp,%eax
ret
#endif

95
code/unix/snapvector.nasm
View file

@ -1,95 +0,0 @@
;===========================================================================
;Copyright (C) 1999-2005 Id Software, Inc.
;
;This file is part of Quake III Arena source code.
;
;Quake III Arena source code is free software; you can redistribute it
;and/or modify it under the terms of the GNU General Public License as
;published by the Free Software Foundation; either version 2 of the License,
;or (at your option) any later version.
;
;Quake III Arena source code is distributed in the hope that it will be
;useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
;MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
;GNU General Public License for more details.
;
;You should have received a copy of the GNU General Public License
;along with Foobar; if not, write to the Free Software
;Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
;===========================================================================
;
; Sys_SnapVector NASM code (Andrew Henderson)
; See win32/win_shared.c for the Win32 equivalent
; This code is provided to ensure that the
; rounding behavior (and, if necessary, the
; precision) of DLL and QVM code are identical
; e.g. for network-visible operations.
; See ftol.nasm for operations on a single float,
; as used in compiled VM and DLL code that does
; not use this system trap.
;
segment .data
fpucw dd 0
cw037F dd 0x037F ; Rounding to nearest (even).
segment .text
; void Sys_SnapVector( float *v )
global Sys_SnapVector
Sys_SnapVector:
push eax
push ebp
mov ebp, esp
fnstcw [fpucw]
mov eax, dword [ebp + 12]
fldcw [cw037F]
fld dword [eax]
fistp dword [eax]
fild dword [eax]
fstp dword [eax]
fld dword [eax + 4]
fistp dword [eax + 4]
fild dword [eax + 4]
fstp dword [eax + 4]
fld dword [eax + 8]
fistp dword [eax + 8]
fild dword [eax + 8]
fstp dword [eax + 8]
fldcw [fpucw]
pop ebp
pop eax
ret
; void Sys_SnapVectorCW( float *v, unsigned short int cw )
global Sys_SnapVectorCW
Sys_SnapVector_cw:
push eax
push ebp
mov ebp, esp
fnstcw [fpucw]
mov eax, dword [ebp + 12]
fldcw [ebp + 16]
fld dword [eax]
fistp dword [eax]
fild dword [eax]
fstp dword [eax]
fld dword [eax + 4]
fistp dword [eax + 4]
fild dword [eax + 4]
fstp dword [eax + 4]
fld dword [eax + 8]
fistp dword [eax + 8]
fild dword [eax + 8]
fstp dword [eax + 8]
fldcw [fpucw]
pop ebp
pop eax
ret

104
code/unix/snapvectora.s Normal file
View file

@ -0,0 +1,104 @@
/*
===========================================================================
Copyright (C) 1999-2005 Id Software, Inc.
This file is part of Quake III Arena source code.
Quake III Arena source code is free software; you can redistribute it
and/or modify it under the terms of the GNU General Public License as
published by the Free Software Foundation; either version 2 of the License,
or (at your option) any later version.
Quake III Arena source code is distributed in the hope that it will be
useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with Foobar; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
===========================================================================
*/
//
// Sys_SnapVector NASM code (Andrew Henderson)
// See win32/win_shared.c for the Win32 equivalent
// This code is provided to ensure that the
// rounding behavior (and, if necessary, the
// precision) of DLL and QVM code are identical
// e.g. for network-visible operations.
// See ftol.nasm for operations on a single float,
// as used in compiled VM and DLL code that does
// not use this system trap.
//
// 23/09/05 Ported to gas by intel2gas, best supporting actor Tim Angus
// <tim@ngus.net>
#define GLQUAKE 1 // don't include unneeded defs
#include "qasm.h"
#ifdef id386
.data
fpucw: .long 0
cw037F: .long 0x037F
.text
// void Sys_SnapVector( float *v )
.global C(Sys_SnapVector)
C(Sys_SnapVector):
pushl %eax
pushl %ebp
movl %esp,%ebp
fnstcw fpucw
movl 12(%ebp),%eax
fldcw cw037F
flds (%eax)
fistpl (%eax)
fildl (%eax)
fstps (%eax)
flds 4(%eax)
fistpl 4(%eax)
fildl 4(%eax)
fstps 4(%eax)
flds 8(%eax)
fistpl 8(%eax)
fildl 8(%eax)
fstps 8(%eax)
fldcw fpucw
popl %ebp
popl %eax
ret
// void Sys_SnapVectorCW( float *v, unsigned short int cw )
.global C(Sys_SnapVectorCW)
C(Sys_SnapVector_cw):
pushl %eax
pushl %ebp
movl %esp,%ebp
fnstcw fpucw
movl 12(%ebp),%eax
fldcw 16(%ebp)
flds (%eax)
fistpl (%eax)
fildl (%eax)
fstps (%eax)
flds 4(%eax)
fistpl 4(%eax)
fildl 4(%eax)
fstps 4(%eax)
flds 8(%eax)
fistpl 8(%eax)
fildl 8(%eax)
fstps 8(%eax)
fldcw fpucw
popl %ebp
popl %eax
ret
#endif