diff options
| author | Steven Fuller <relnev@icculus.org> | 2015-02-14 12:00:00 +0100 |
|---|---|---|
| committer | Patryk Obara <dreamer.tan@gmail.com> | 2019-08-20 03:51:33 +0200 |
| commit | 0de664d0a886bcda45a0cd05551b6896c5c46ed0 (patch) | |
| tree | 50127b6ec478d76bc714dbfda69602610334ed0c /src/win95/inline.h | |
| parent | 22475d6d94e96056d1550dca00b32d00e3821649 (diff) | |
Import icculus.org release (2015-02-14)
Diffstat (limited to 'src/win95/inline.h')
| -rw-r--r-- | src/win95/inline.h | 18 |
1 files changed, 4 insertions, 14 deletions
diff --git a/src/win95/inline.h b/src/win95/inline.h index 8b162c8..dcb9dff 100644 --- a/src/win95/inline.h +++ b/src/win95/inline.h @@ -581,6 +581,10 @@ a = itmp;} #else +// parts of mathline.c that have been re-inlined. +// MUL_FIXED, f2i +#include "mathline.h" + /* inline assembly has been moved to mathline.c */ void ADD_LL(LONGLONGCH *a, LONGLONGCH *b, LONGLONGCH *c); void ADD_LL_PP(LONGLONGCH *c, LONGLONGCH *a); @@ -592,7 +596,6 @@ void EQUALS_LL(LONGLONGCH *a, LONGLONGCH *b); void NEG_LL(LONGLONGCH *a); void ASR_LL(LONGLONGCH *a, int shift); void IntToLL(LONGLONGCH *a, int *b); -int MUL_FIXED(int a, int b); int DIV_FIXED(int a, int b); #define DIV_INT(a, b) ((a) / (b)) @@ -602,20 +605,7 @@ int WideMulNarrowDiv(int a, int b, int c); void RotateVector_ASM(VECTORCH *v, MATRIXCH *m); void RotateAndCopyVector_ASM(VECTORCH *v1, VECTORCH *v2, MATRIXCH *m); -/* -int FloatToInt(float); -#define f2i(a, b) { a = FloatToInt(b); } -*/ - int SqRoot32(int A); -void FloatToInt(); -extern float fti_fptmp; -extern int fti_itmp; - -#define f2i(a, b) { \ -fti_fptmp = (b); \ -FloatToInt(); \ -a = fti_itmp;} #endif |