[PATCH] Replace id386 define It seems the old trick of undef'ing __i386__ was no longer working under gcc-4.1, so replace the id386 define (controlled by header files) with USE_X86_ASM (controlled by Makefile). The checks for id386 in the assembly files are now gone (if you don't want them, they shouldn't be compiled) and a few extra whitespace cleanups crept in. diff -urN a/Makefile head/Makefile --- a/Makefile 2006-03-16 21:50:49.000000000 +1030 +++ head/Makefile 2006-03-16 16:49:34.000000000 +1030 @@ -140,8 +140,8 @@ COMMON_CPPFLAGS += -DNDEBUG endif -ifdef NO_X86_ASM -COMMON_CPPFLAGS += -U__i386__ +ifndef NO_X86_ASM +COMMON_CPPFLAGS += -DUSE_X86_ASM endif COMMON_CPPFLAGS += -I$(TOPDIR)/include diff -urN a/NQ/d_polyse.c head/NQ/d_polyse.c --- a/NQ/d_polyse.c 2004-07-25 15:59:54.000000000 +0930 +++ head/NQ/d_polyse.c 2006-03-16 11:40:52.000000000 +1030 @@ -114,7 +114,7 @@ void D_RasterizeAliasPolySmooth(void); void D_PolysetScanLeftEdge(int height); -#if !id386 +#ifndef USE_X86_ASM /* ================ @@ -374,7 +374,7 @@ D_PolysetRecursiveTriangle(lp3, new, lp2); } -#endif // !id386 +#endif /* USE_X86_ASM */ /* @@ -399,7 +399,7 @@ } -#if !id386 +#ifndef USE_X86_ASM /* =================== @@ -462,7 +462,7 @@ } while (--height); } -#endif // !id386 +#endif /* USE_X86_ASM */ /* @@ -501,7 +501,7 @@ } -#if !id386 +#ifndef USE_X86_ASM /* ================ @@ -554,7 +554,7 @@ r_zistepy = (int)((t1 * p00_minus_p20 - t0 * p10_minus_p20) * ystepdenominv); -#if id386 +#ifdef USE_X86_ASM a_sstepxfrac = r_sstepx << 16; a_tstepxfrac = r_tstepx << 16; #else @@ -565,7 +565,7 @@ a_ststepxwhole = skinwidth * (r_tstepx >> 16) + (r_sstepx >> 16); } -#endif // !id386 +#endif /* USE_X86_ASM */ #if 0 @@ -586,7 +586,7 @@ #endif -#if !id386 +#ifndef USE_X86_ASM /* ================ @@ -649,7 +649,7 @@ pspanpackage++; } while (pspanpackage->count != -999999); } -#endif // !id386 +#endif /* USE_X86_ASM */ /* @@ -728,7 +728,7 @@ d_ptex = (byte *)r_affinetridesc.pskin + (plefttop[2] >> 16) + (plefttop[3] >> 16) * r_affinetridesc.skinwidth; -#if id386 +#ifdef USE_X86_ASM d_sfrac = (plefttop[2] & 0xFFFF) << 16; d_tfrac = (plefttop[3] & 0xFFFF) << 16; #else @@ -759,7 +759,7 @@ D_PolysetSetUpForLineScan(plefttop[0], plefttop[1], pleftbottom[0], pleftbottom[1]); -#if id386 +#ifdef USE_X86_ASM d_pzbasestep = (d_zwidth + ubasestep) << 1; d_pzextrastep = d_pzbasestep + 2; #else @@ -784,7 +784,7 @@ d_ptexbasestep = ((r_sstepy + r_sstepx * ubasestep) >> 16) + ((r_tstepy + r_tstepx * ubasestep) >> 16) * r_affinetridesc.skinwidth; -#if id386 +#ifdef USE_X86_ASM d_sfracbasestep = (r_sstepy + r_sstepx * ubasestep) << 16; d_tfracbasestep = (r_tstepy + r_tstepx * ubasestep) << 16; #else @@ -797,7 +797,7 @@ d_ptexextrastep = ((r_sstepy + r_sstepx * d_countextrastep) >> 16) + ((r_tstepy + r_tstepx * d_countextrastep) >> 16) * r_affinetridesc.skinwidth; -#if id386 +#ifdef USE_X86_ASM d_sfracextrastep = (r_sstepy + r_sstepx * d_countextrastep) << 16; d_tfracextrastep = (r_tstepy + r_tstepx * d_countextrastep) << 16; #else @@ -856,7 +856,7 @@ d_pdestbasestep = screenwidth + ubasestep; d_pdestextrastep = d_pdestbasestep + 1; -#if id386 +#ifdef USE_X86_ASM d_pzbasestep = (d_zwidth + ubasestep) << 1; d_pzextrastep = d_pzbasestep + 2; #else @@ -873,7 +873,7 @@ d_ptexbasestep = ((r_sstepy + r_sstepx * ubasestep) >> 16) + ((r_tstepy + r_tstepx * ubasestep) >> 16) * r_affinetridesc.skinwidth; -#if id386 +#ifdef USE_X86_ASM d_sfracbasestep = (r_sstepy + r_sstepx * ubasestep) << 16; d_tfracbasestep = (r_tstepy + r_tstepx * ubasestep) << 16; #else @@ -888,7 +888,7 @@ ((r_tstepy + r_tstepx * d_countextrastep) >> 16) * r_affinetridesc.skinwidth; -#if id386 +#ifdef USE_X86_ASM d_sfracextrastep = ((r_sstepy + r_sstepx * d_countextrastep) & 0xFFFF) << 16; d_tfracextrastep = diff -urN a/NQ/quakedef.h head/NQ/quakedef.h --- a/NQ/quakedef.h 2006-03-12 00:01:36.000000000 +1030 +++ head/NQ/quakedef.h 2006-03-16 11:41:35.000000000 +1030 @@ -37,14 +37,8 @@ #define GAMENAME "id1" // directory to look in by default -#if defined(__i386__) -#define id386 1 -#else -#define id386 0 -#endif - /* UNALIGNED_OK - undef if unaligned accesses are not supported */ -#if id386 +#ifdef USE_X86_ASM #define UNALIGNED_OK #else #undef UNALIGNED_OK diff -urN a/NQ/r_main.c head/NQ/r_main.c --- a/NQ/r_main.c 2005-01-09 20:40:35.000000000 +1030 +++ head/NQ/r_main.c 2006-03-16 11:42:14.000000000 +1030 @@ -259,7 +259,7 @@ R_InitParticles(); // TODO: collect 386-specific code in one place -#if id386 +#ifdef USE_X86_ASM Sys_MakeCodeWriteable((long)R_EdgeCodeStart, (long)R_EdgeCodeEnd - (long)R_EdgeCodeStart); #endif @@ -491,7 +491,7 @@ r_fov_greater_than_90 = true; // TODO: collect 386-specific code in one place -#if id386 +#ifdef USE_X86_ASM if (r_pixbytes == 1) { Sys_MakeCodeWriteable((long)R_Surf8Start, (long)R_Surf8End - (long)R_Surf8Start); diff -urN a/NQ/r_misc.c head/NQ/r_misc.c --- a/NQ/r_misc.c 2004-08-08 17:47:25.000000000 +0930 +++ head/NQ/r_misc.c 2006-03-16 11:43:36.000000000 +1030 @@ -295,7 +295,7 @@ } } -#if !id386 +#ifndef USE_X86_ASM /* ================ diff -urN a/NQ/sys_linux.c head/NQ/sys_linux.c --- a/NQ/sys_linux.c 2006-03-12 06:15:47.000000000 +1030 +++ head/NQ/sys_linux.c 2006-03-16 11:42:41.000000000 +1030 @@ -114,7 +114,7 @@ void Sys_Init(void) { -#if id386 +#ifdef USE_X86_ASM Sys_SetFPCW(); #endif } @@ -321,7 +321,7 @@ return NULL; } -#if !id386 +#ifndef USE_X86_ASM void Sys_HighFPPrecision(void) { diff -urN a/NQ/sys_win.c head/NQ/sys_win.c --- a/NQ/sys_win.c 2006-03-12 06:15:47.000000000 +1030 +++ head/NQ/sys_win.c 2006-03-16 11:43:59.000000000 +1030 @@ -297,7 +297,7 @@ Sys_Error("Protection change failed"); } -#if !id386 +#ifndef USE_X86_ASM void Sys_SetFPCW(void) @@ -924,7 +924,7 @@ return TRUE; } -#if !id386 +#ifndef USE_X86_ASM void Sys_HighFPPrecision(void) { diff -urN a/NQ/world.c head/NQ/world.c --- a/NQ/world.c 2006-03-09 20:06:37.000000000 +1030 +++ head/NQ/world.c 2006-03-16 11:43:08.000000000 +1030 @@ -468,7 +468,7 @@ =============================================================================== */ -#if !id386 +#ifndef USE_X86_ASM /* ================== @@ -507,7 +507,7 @@ return num - 0x10000; } -#endif // !id386 +#endif /* USE_X86_ASM */ /* diff -urN a/NQ/worlda.S head/NQ/worlda.S --- a/NQ/worlda.S 2006-03-09 19:56:59.000000000 +1030 +++ head/NQ/worlda.S 2006-03-16 21:55:21.000000000 +1030 @@ -25,8 +25,6 @@ #include "asm_i386.h" #include "quakeasm.h" -#if id386 - .data Ltemp: .long 0 @@ -127,7 +125,7 @@ andl %ecx,%eax orl %esi,%eax - cmpl $0x0000FFF0,%eax + cmpl $0xFFF0,%eax jb Lhloop // Re-interpret sign bit and extend @@ -144,6 +142,3 @@ popl %edi ret - -#endif // id386 - diff -urN a/QW/client/bothdefs.h head/QW/client/bothdefs.h --- a/QW/client/bothdefs.h 2006-03-12 06:15:47.000000000 +1030 +++ head/QW/client/bothdefs.h 2006-03-16 17:19:17.000000000 +1030 @@ -23,18 +23,12 @@ // defs common to client and server -#if defined(__i386__) && !defined(id386) -#define id386 1 -#else -#define id386 0 -#endif - #ifdef SERVERONLY // no asm in dedicated server -#undef id386 +#undef USE_X86_ASM #endif /* UNALIGNED_OK - undef if unaligned accesses are not supported */ -#if id386 +#ifdef USE_X86_ASM #define UNALIGNED_OK #else #undef UNALIGNED_OK diff -urN a/QW/client/d_polyse.c head/QW/client/d_polyse.c --- a/QW/client/d_polyse.c 2004-07-25 15:59:56.000000000 +0930 +++ head/QW/client/d_polyse.c 2006-03-16 17:21:24.000000000 +1030 @@ -114,7 +114,7 @@ void D_RasterizeAliasPolySmooth(void); void D_PolysetScanLeftEdge(int height); -#if !id386 +#ifndef USE_X86_ASM /* ================ @@ -374,7 +374,7 @@ D_PolysetRecursiveTriangle(lp3, new, lp2); } -#endif // !id386 +#endif /* USE_X86_ASM */ /* @@ -399,7 +399,7 @@ } -#if !id386 +#ifndef USE_X86_ASM /* =================== @@ -462,7 +462,7 @@ } while (--height); } -#endif // !id386 +#endif /* USE_X86_ASM */ /* @@ -501,7 +501,7 @@ } -#if !id386 +#ifndef USE_X86_ASM /* ================ @@ -554,7 +554,7 @@ r_zistepy = (int)((t1 * p00_minus_p20 - t0 * p10_minus_p20) * ystepdenominv); -#if id386 +#ifdef USE_X86_ASM a_sstepxfrac = r_sstepx << 16; a_tstepxfrac = r_tstepx << 16; #else @@ -565,7 +565,7 @@ a_ststepxwhole = skinwidth * (r_tstepx >> 16) + (r_sstepx >> 16); } -#endif // !id386 +#endif /* USE_X86_ASM */ byte gelmap[256]; @@ -584,7 +584,7 @@ } -#if !id386 +#ifndef USE_X86_ASM /* ================ @@ -647,7 +647,7 @@ pspanpackage++; } while (pspanpackage->count != -999999); } -#endif // !id386 +#endif /* USE_X86_ASM */ /* @@ -729,7 +729,7 @@ d_ptex = (byte *)r_affinetridesc.pskin + (plefttop[2] >> 16) + (plefttop[3] >> 16) * r_affinetridesc.skinwidth; -#if id386 +#ifdef USE_X86_ASM d_sfrac = (plefttop[2] & 0xFFFF) << 16; d_tfrac = (plefttop[3] & 0xFFFF) << 16; d_pzbasestep = (d_zwidth + ubasestep) << 1; @@ -761,7 +761,7 @@ d_countextrastep = ubasestep + 1; d_ptexbasestep = ((r_sstepy + r_sstepx * ubasestep) >> 16) + ((r_tstepy + r_tstepx * ubasestep) >> 16) * r_affinetridesc.skinwidth; -#if id386 +#ifdef USE_X86_ASM d_sfracbasestep = (r_sstepy + r_sstepx * ubasestep) << 16; d_tfracbasestep = (r_tstepy + r_tstepx * ubasestep) << 16; #else @@ -774,7 +774,7 @@ d_ptexextrastep = ((r_sstepy + r_sstepx * d_countextrastep) >> 16) + ((r_tstepy + r_tstepx * d_countextrastep) >> 16) * r_affinetridesc.skinwidth; -#if id386 +#ifdef USE_X86_ASM d_sfracextrastep = (r_sstepy + r_sstepx * d_countextrastep) << 16; d_tfracextrastep = (r_tstepy + r_tstepx * d_countextrastep) << 16; #else @@ -814,7 +814,7 @@ d_pdestbasestep = screenwidth + ubasestep; d_pdestextrastep = d_pdestbasestep + 1; d_pdest = (byte *)d_viewbuffer + ystart * screenwidth + plefttop[0]; -#if id386 +#ifdef USE_X86_ASM d_pzbasestep = (d_zwidth + ubasestep) << 1; d_pzextrastep = d_pzbasestep + 2; #else @@ -832,7 +832,7 @@ d_ptexbasestep = ((r_sstepy + r_sstepx * ubasestep) >> 16) + ((r_tstepy + r_tstepx * ubasestep) >> 16) * r_affinetridesc.skinwidth; -#if id386 +#ifdef USE_X86_ASM d_sfracbasestep = (r_sstepy + r_sstepx * ubasestep) << 16; d_tfracbasestep = (r_tstepy + r_tstepx * ubasestep) << 16; #else @@ -845,7 +845,7 @@ d_ptexextrastep = ((r_sstepy + r_sstepx * d_countextrastep) >> 16) + ((r_tstepy + r_tstepx * d_countextrastep) >> 16) * r_affinetridesc.skinwidth; -#if id386 +#ifdef USE_X86_ASM d_sfracextrastep = ((r_sstepy + r_sstepx * d_countextrastep) & 0xFFFF) << 16; d_tfracextrastep = diff -urN a/QW/client/r_main.c head/QW/client/r_main.c --- a/QW/client/r_main.c 2005-01-09 20:40:35.000000000 +1030 +++ head/QW/client/r_main.c 2006-03-16 17:21:50.000000000 +1030 @@ -263,7 +263,7 @@ R_InitParticles(); // TODO: collect 386-specific code in one place -#if id386 +#ifdef USE_X86_ASM Sys_MakeCodeWriteable((long)R_EdgeCodeStart, (long)R_EdgeCodeEnd - (long)R_EdgeCodeStart); #endif @@ -509,7 +509,7 @@ r_fov_greater_than_90 = true; // TODO: collect 386-specific code in one place -#if id386 +#ifdef USE_X86_ASM if (r_pixbytes == 1) { Sys_MakeCodeWriteable((long)R_Surf8Start, (long)R_Surf8End - (long)R_Surf8Start); diff -urN a/QW/client/r_misc.c head/QW/client/r_misc.c --- a/QW/client/r_misc.c 2004-08-08 17:47:25.000000000 +0930 +++ head/QW/client/r_misc.c 2006-03-16 17:22:08.000000000 +1030 @@ -367,7 +367,7 @@ } } -#if !id386 +#ifndef USE_X86_ASM /* ================ diff -urN a/QW/client/sys_linux.c head/QW/client/sys_linux.c --- a/QW/client/sys_linux.c 2006-03-12 06:15:47.000000000 +1030 +++ head/QW/client/sys_linux.c 2006-03-16 17:22:35.000000000 +1030 @@ -93,7 +93,7 @@ void Sys_Init(void) { -#if id386 +#ifdef USE_X86_ASM Sys_SetFPCW(); #endif } @@ -295,7 +295,7 @@ return NULL; } -#if !id386 +#ifndef USE_X86_ASM void Sys_HighFPPrecision(void) { diff -urN a/QW/client/sys_win.c head/QW/client/sys_win.c --- a/QW/client/sys_win.c 2004-08-11 22:35:12.000000000 +0930 +++ head/QW/client/sys_win.c 2006-03-16 17:22:51.000000000 +1030 @@ -684,7 +684,7 @@ return TRUE; } -#if !id386 +#ifndef USE_X86_ASM void Sys_HighFPPrecision(void) { diff -urN a/QW/server/world.c head/QW/server/world.c --- a/QW/server/world.c 2006-03-09 20:06:37.000000000 +1030 +++ head/QW/server/world.c 2006-03-16 17:23:23.000000000 +1030 @@ -451,7 +451,7 @@ =============================================================================== */ -#if !id386 +#ifndef USE_X86_ASM /* ================== @@ -490,7 +490,7 @@ return num - 0x10000; } -#endif // !id386 +#endif /* USE_X86_ASM */ /* diff -urN a/common/d_draw.S head/common/d_draw.S --- a/common/d_draw.S 2004-07-25 15:59:58.000000000 +0930 +++ head/common/d_draw.S 2006-03-16 21:55:38.000000000 +1030 @@ -27,8 +27,6 @@ #include "asm_draw.h" #include "d_ifacea.h" -#if id386 - //---------------------------------------------------------------------- // 8-bpp horizontal span drawing code for polygons, with no transparency. // @@ -1033,5 +1031,3 @@ popl %edi popl %ebp // restore the caller's stack frame ret - -#endif // id386 diff -urN a/common/d_draw16.S head/common/d_draw16.S --- a/common/d_draw16.S 2004-07-25 15:59:58.000000000 +0930 +++ head/common/d_draw16.S 2006-03-16 21:55:49.000000000 +1030 @@ -28,8 +28,6 @@ #include "asm_draw.h" #include "d_ifacea.h" -#if id386 - //---------------------------------------------------------------------- // 8-bpp horizontal span drawing code for polygons, with no transparency and // 16-pixel subdivision. @@ -970,5 +968,3 @@ popl %edi popl %ebp // restore the caller's stack frame ret - -#endif // id386 diff -urN a/common/d_init.c head/common/d_init.c --- a/common/d_init.c 2004-07-25 15:59:58.000000000 +0930 +++ head/common/d_init.c 2006-03-16 11:45:16.000000000 +1030 @@ -152,7 +152,7 @@ for (i = 0; i < (NUM_MIPS - 1); i++) d_scalemip[i] = basemip[i] * d_mipscale.value; -#if id386 +#ifdef USE_X86_ASM if (d_subdiv16.value) d_drawspans = D_DrawSpans16; else diff -urN a/common/d_modech.c head/common/d_modech.c --- a/common/d_modech.c 2004-07-25 15:59:59.000000000 +0930 +++ head/common/d_modech.c 2006-03-16 11:45:39.000000000 +1030 @@ -38,7 +38,7 @@ void D_Patch(void) { -#if id386 +#ifdef USE_X86_ASM static qboolean protectset8 = false; @@ -48,7 +48,7 @@ (int)D_PolysetAff8Start); protectset8 = true; } -#endif // id386 +#endif /* USE_X86_ASM */ } diff -urN a/common/d_part.c head/common/d_part.c --- a/common/d_part.c 2004-08-08 14:50:08.000000000 +0930 +++ head/common/d_part.c 2006-03-16 11:46:17.000000000 +1030 @@ -47,7 +47,7 @@ } -#if !id386 +#ifndef USE_X86_ASM /* ============== @@ -185,4 +185,4 @@ } } -#endif // !id386 +#endif /* USE_X86_ASM */ diff -urN a/common/d_parta.S head/common/d_parta.S --- a/common/d_parta.S 2006-02-19 08:18:19.000000000 +1030 +++ head/common/d_parta.S 2006-03-16 21:56:04.000000000 +1030 @@ -27,8 +27,6 @@ #include "d_ifacea.h" #include "asm_draw.h" -#if id386 - //---------------------------------------------------------------------- // 8-bpp particle drawing code. //---------------------------------------------------------------------- @@ -473,5 +471,3 @@ LPop1AndDone: fstp %st(0) jmp LDone - -#endif // id386 diff -urN a/common/d_polysa.S head/common/d_polysa.S --- a/common/d_polysa.S 2006-02-19 08:18:19.000000000 +1030 +++ head/common/d_polysa.S 2006-03-16 21:56:21.000000000 +1030 @@ -27,8 +27,6 @@ #include "asm_draw.h" #include "d_ifacea.h" -#if id386 - // !!! if this is changed, it must be changed in d_polyse.c too !!! #define DPS_MAXSPANS (MAXHEIGHT+1) // 1 extra for spanpackage that marks end @@ -1735,6 +1733,3 @@ addl $(SPAN_SIZE),%esp ret - - -#endif // id386 diff -urN a/common/d_scan.c head/common/d_scan.c --- a/common/d_scan.c 2004-07-25 15:59:59.000000000 +0930 +++ head/common/d_scan.c 2006-03-16 11:47:42.000000000 +1030 @@ -97,7 +97,7 @@ } -#if !id386 +#ifndef USE_X86_ASM /* ============= @@ -122,7 +122,7 @@ } while (--r_turb_spancount > 0); } -#endif // !id386 +#endif /* USE_X86_ASM */ /* @@ -255,7 +255,7 @@ } -#if !id386 +#ifndef USE_X86_ASM /* ============= @@ -387,7 +387,7 @@ #endif -#if !id386 +#ifndef USE_X86_ASM /* ============= diff -urN a/common/d_scana.S head/common/d_scana.S --- a/common/d_scana.S 2004-07-25 15:59:59.000000000 +0930 +++ head/common/d_scana.S 2006-03-16 21:56:36.000000000 +1030 @@ -27,8 +27,6 @@ #include "asm_draw.h" #include "d_ifacea.h" -#if id386 - .data .text @@ -84,6 +82,3 @@ popl %esi popl %ebp // restore caller's stack frame pointer ret - -#endif // id386 - diff -urN a/common/d_spr8.S head/common/d_spr8.S --- a/common/d_spr8.S 2004-07-25 15:59:59.000000000 +0930 +++ head/common/d_spr8.S 2006-03-16 21:56:48.000000000 +1030 @@ -26,8 +26,6 @@ #include "quakeasm.h" #include "asm_draw.h" -#if id386 - //---------------------------------------------------------------------- // 8-bpp horizontal span drawing code for polygons, with transparency. //---------------------------------------------------------------------- @@ -896,5 +894,3 @@ popl %edi popl %ebp // restore the caller's stack frame ret - -#endif // id386 diff -urN a/common/d_sprite.c head/common/d_sprite.c --- a/common/d_sprite.c 2004-07-25 15:59:59.000000000 +0930 +++ head/common/d_sprite.c 2006-03-16 11:48:52.000000000 +1030 @@ -27,7 +27,7 @@ static int minindex, maxindex; static sspan_t *sprite_spans; -#if !id386 +#ifndef USE_X86_ASM /* ===================== diff -urN a/common/d_vars.c head/common/d_vars.c --- a/common/d_vars.c 2004-07-25 15:59:59.000000000 +0930 +++ head/common/d_vars.c 2006-03-16 11:49:26.000000000 +1030 @@ -19,7 +19,7 @@ */ // r_vars.c: global refresh variables -#if !id386 +#ifndef USE_X86_ASM #include "mathlib.h" #include "quakedef.h" @@ -48,4 +48,4 @@ unsigned int d_zrowbytes; unsigned int d_zwidth; -#endif // !id386 +#endif /* USE_X86_ASM */ diff -urN a/common/d_varsa.S head/common/d_varsa.S --- a/common/d_varsa.S 2004-08-08 16:37:41.000000000 +0930 +++ head/common/d_varsa.S 2006-03-16 21:57:02.000000000 +1030 @@ -26,8 +26,6 @@ #include "asm_draw.h" #include "d_ifacea.h" -#if id386 - .data //------------------------------------------------------- @@ -205,5 +203,3 @@ spr8entryvec_table: .long 0, Spr8Entry2_8, Spr8Entry3_8, Spr8Entry4_8 .long Spr8Entry5_8, Spr8Entry6_8, Spr8Entry7_8, Spr8Entry8_8 - -#endif // id386 diff -urN a/common/math.S head/common/math.S --- a/common/math.S 2004-08-01 13:20:37.000000000 +0930 +++ head/common/math.S 2006-03-16 22:00:35.000000000 +1030 @@ -24,9 +24,6 @@ #include "asm_i386.h" #include "quakeasm.h" - -#if id386 - .data .align 4 @@ -413,5 +410,3 @@ Lerror: call C(BOPS_Error) - -#endif // id386 diff -urN a/common/mathlib.c head/common/mathlib.c --- a/common/mathlib.c 2005-01-29 11:16:40.000000000 +1030 +++ head/common/mathlib.c 2006-03-16 11:50:56.000000000 +1030 @@ -25,9 +25,9 @@ #include "sys.h" #ifdef SERVERONLY -#include "qwsvdef.h" // id386 +#include "qwsvdef.h" #else -#include "quakedef.h" // id386 +#include "quakedef.h" #endif #ifdef GLQUAKE @@ -184,7 +184,7 @@ Sys_Error("%s: Bad signbits", __func__); } -#if !id386 +#ifndef USE_X86_ASM /* ================== @@ -319,7 +319,7 @@ return sides; } -#endif // !id386 +#endif /* USE_X86_ASM */ void @@ -603,7 +603,7 @@ } -#if !id386 +#ifndef USE_X86_ASM // TODO: move to nonintel.c @@ -625,4 +625,4 @@ (((double)0x10000 * (double)0x1000000 / (double)val) + 0.5); } -#endif // !id386 +#endif /* USE_X86_ASM */ diff -urN a/common/r_aclip.c head/common/r_aclip.c --- a/common/r_aclip.c 2004-07-25 15:59:59.000000000 +0930 +++ head/common/r_aclip.c 2006-03-16 11:51:21.000000000 +1030 @@ -89,7 +89,7 @@ } -#if !id386 +#ifndef USE_X86_ASM void R_Alias_clip_left(finalvert_t *pfv0, finalvert_t *pfv1, finalvert_t *out) diff -urN a/common/r_aclipa.S head/common/r_aclipa.S --- a/common/r_aclipa.S 2004-07-25 15:59:59.000000000 +0930 +++ head/common/r_aclipa.S 2006-03-16 22:00:48.000000000 +1030 @@ -27,8 +27,6 @@ #include "asm_draw.h" #include "d_ifacea.h" -#if id386 - .data Ltemp0: .long 0 Ltemp1: .long 0 @@ -210,7 +208,3 @@ movl C(r_refdef)+rd_aliasvrect+0,%eax jmp LRightLeftEntry - - -#endif // id386 - diff -urN a/common/r_alias.c head/common/r_alias.c --- a/common/r_alias.c 2006-02-19 09:03:43.000000000 +1030 +++ head/common/r_alias.c 2006-03-16 12:01:46.000000000 +1030 @@ -435,7 +435,7 @@ } -#if !id386 +#ifndef USE_X86_ASM /* ================ @@ -730,7 +730,7 @@ if (r_affinetridesc.drawtype) { D_PolysetUpdateTables(); // FIXME: precalc... } else { -#if id386 +#ifdef USE_X86_ASM D_Aff8Patch(currententity->colormap); #endif } diff -urN a/common/r_aliasa.S head/common/r_aliasa.S --- a/common/r_aliasa.S 2004-07-25 15:59:59.000000000 +0930 +++ head/common/r_aliasa.S 2006-03-16 22:00:57.000000000 +1030 @@ -27,8 +27,6 @@ #include "asm_draw.h" #include "d_ifacea.h" -#if id386 - .data Lfloat_1: .single 1.0 @@ -232,6 +230,3 @@ Lsavelight: fstp %st(0) jmp Lp1 - -#endif // id386 - diff -urN a/common/r_draw.c head/common/r_draw.c --- a/common/r_draw.c 2004-07-25 15:59:59.000000000 +0930 +++ head/common/r_draw.c 2006-03-16 11:52:45.000000000 +1030 @@ -69,7 +69,7 @@ qboolean r_lastvertvalid; -#if !id386 +#ifndef USE_X86_ASM /* ================ @@ -326,7 +326,7 @@ R_EmitEdge(pv0, pv1); } -#endif // !id386 +#endif /* USE_X86_ASM */ /* diff -urN a/common/r_drawa.S head/common/r_drawa.S --- a/common/r_drawa.S 2004-07-25 15:59:59.000000000 +0930 +++ head/common/r_drawa.S 2006-03-16 22:01:20.000000000 +1030 @@ -27,11 +27,9 @@ #include "asm_draw.h" #include "d_ifacea.h" -#if id386 - // !!! if these are changed, they must be changed in r_draw.c too !!! #define FULLY_CLIPPED_CACHED 0x80000000 -#define FRAMECOUNT_MASK 0x7FFFFFFF +#define FRAMECOUNT_MASK 0x7FFFFFFF .data @@ -833,6 +831,3 @@ flds C(r_refdef)+rd_fvrectbottom_adj LClampP3: ret - -#endif // id386 - diff -urN a/common/r_edge.c head/common/r_edge.c --- a/common/r_edge.c 2004-08-01 13:29:15.000000000 +0930 +++ head/common/r_edge.c 2006-03-16 11:54:27.000000000 +1030 @@ -152,7 +152,7 @@ } -#if !id386 +#ifndef USE_X86_ASM /* ============== @@ -196,10 +196,10 @@ } while ((edgestoadd = next_edge) != NULL); } -#endif // !id386 +#endif /* USE_X86_ASM */ -#if !id386 +#ifndef USE_X86_ASM /* ============== @@ -216,10 +216,10 @@ } while ((pedge = pedge->nextremove) != NULL); } -#endif // !id386 +#endif /* USE_X86_ASM */ -#if !id386 +#ifndef USE_X86_ASM /* ============== @@ -285,7 +285,7 @@ } } -#endif // !id386 +#endif /* USE_X86_ASM */ /* @@ -434,7 +434,7 @@ } -#if !id386 +#ifndef USE_X86_ASM /* ============== @@ -587,7 +587,7 @@ R_CleanupSpan(); } -#endif // !id386 +#endif /* USE_X86_ASM */ /* diff -urN a/common/r_edgea.S head/common/r_edgea.S --- a/common/r_edgea.S 2004-07-25 15:59:59.000000000 +0930 +++ head/common/r_edgea.S 2006-03-16 22:01:42.000000000 +1030 @@ -26,13 +26,11 @@ #include "quakeasm.h" #include "asm_draw.h" -#if id386 - .data -Ltemp: .long 0 +Ltemp: .long 0 float_1_div_0100000h: .long 0x35800000 // 1.0/(float)0x100000 -float_point_999: .single 0.999 -float_1_point_001: .single 1.001 +float_point_999: .single 0.999 +float_1_point_001: .single 1.001 .text @@ -745,6 +743,3 @@ movl %eax,LPatch3-4 ret - -#endif // id386 - diff -urN a/common/r_surf.c head/common/r_surf.c --- a/common/r_surf.c 2004-07-25 15:59:59.000000000 +0930 +++ head/common/r_surf.c 2006-03-16 11:55:20.000000000 +1030 @@ -40,7 +40,7 @@ static int r_numhblocks; int r_numvblocks; -#if !id386 +#ifndef USE_X86_ASM void R_DrawSurfaceBlock8_mip0(void); void R_DrawSurfaceBlock8_mip1(void); void R_DrawSurfaceBlock8_mip2(void); @@ -308,7 +308,7 @@ //============================================================================= -#if !id386 +#ifndef USE_X86_ASM /* ================ diff -urN a/common/r_vars.c head/common/r_vars.c --- a/common/r_vars.c 2004-07-25 15:59:59.000000000 +0930 +++ head/common/r_vars.c 2006-03-16 11:56:07.000000000 +1030 @@ -21,7 +21,7 @@ #include "quakedef.h" -#if !id386 +#ifndef USE_X86_ASM // all global and static refresh variables are collected in a contiguous block // to avoid cache conflicts. @@ -35,4 +35,4 @@ int r_bmodelactive; -#endif // !id386 +#endif /* USE_X86_ASM */ diff -urN a/common/r_varsa.S head/common/r_varsa.S --- a/common/r_varsa.S 2004-07-25 15:59:59.000000000 +0930 +++ head/common/r_varsa.S 2006-03-16 22:02:33.000000000 +1030 @@ -26,8 +26,6 @@ #include "asm_draw.h" #include "d_ifacea.h" -#if id386 - .data //------------------------------------------------------- @@ -37,15 +35,15 @@ .globl float_minus_1, float_0 float_0: .single 0.0 float_1: .single 1.0 -float_minus_1: .single -1.0 +float_minus_1: .single -1.0 float_particle_z_clip: .single PARTICLE_Z_CLIP -float_point5: .single 0.5 +float_point5: .single 0.5 .globl fp_16, fp_64k, fp_1m, fp_64kx64k .globl fp_1m_minus_1 .globl fp_8 fp_1m: .single 1048576.0 -fp_1m_minus_1: .single 1048575.0 +fp_1m_minus_1: .single 1048575.0 fp_64k: .single 65536.0 fp_8: .single 8.0 fp_16: .single 16.0 @@ -53,12 +51,9 @@ .globl FloatZero, Float2ToThe31nd, FloatMinus2ToThe31nd -FloatZero: .long 0 -Float2ToThe31nd: .long 0x4f000000 +FloatZero: .long 0 +Float2ToThe31nd: .long 0x4f000000 FloatMinus2ToThe31nd: .long 0xcf000000 .globl C(r_bmodelactive) C(r_bmodelactive): .long 0 - -#endif // id386 - diff -urN a/common/snd_mix.c head/common/snd_mix.c --- a/common/snd_mix.c 2006-03-16 16:46:24.000000000 +1030 +++ head/common/snd_mix.c 2006-03-16 21:43:22.000000000 +1030 @@ -30,7 +30,7 @@ #define DWORD unsigned long #endif -#define PAINTBUFFER_SIZE 512 +#define PAINTBUFFER_SIZE 512 portable_samplepair_t paintbuffer[PAINTBUFFER_SIZE]; int snd_scaletable[32][256]; int *snd_p, snd_linear_count, snd_vol; @@ -38,7 +38,7 @@ void Snd_WriteLinearBlastStereo16(void); -#if !id386 +#ifndef USE_X86_ASM void Snd_WriteLinearBlastStereo16(void) { @@ -332,7 +332,7 @@ } -#if !id386 +#ifndef USE_X86_ASM void SND_PaintChannelFrom8(channel_t *ch, sfxcache_t *sc, int count) @@ -360,7 +360,7 @@ ch->pos += count; } -#endif // !id386 +#endif /* USE_X86_ASM */ void diff -urN a/common/snd_mixa.S head/common/snd_mixa.S --- a/common/snd_mixa.S 2004-07-25 15:59:59.000000000 +0930 +++ head/common/snd_mixa.S 2006-03-16 21:57:15.000000000 +1030 @@ -25,16 +25,14 @@ #include "asm_i386.h" #include "quakeasm.h" -#if id386 - .text //---------------------------------------------------------------------- // 8-bit sound-mixing code //---------------------------------------------------------------------- -#define ch 4+16 -#define sc 8+16 +#define ch 4+16 +#define sc 8+16 #define count 12+16 .globl C(SND_PaintChannelFrom8) @@ -47,7 +45,7 @@ // int data; // short *lscale, *rscale; // unsigned char *sfx; -// int i; +// int i; movl ch(%esp),%ebx movl sc(%esp),%esi @@ -59,11 +57,11 @@ movl ch_leftvol(%ebx),%eax movl ch_rightvol(%ebx),%edx cmpl $255,%eax - jna LLeftSet + jna LLeftSet movl $255,%eax LLeftSet: cmpl $255,%edx - jna LRightSet + jna LRightSet movl $255,%edx LRightSet: @@ -87,7 +85,7 @@ movb -1(%esi,%ecx,1),%bl testl $1,%ecx - jz LMix8Loop + jz LMix8Loop movl (%eax,%ebx,4),%edi movl (%edx,%ebx,4),%ebp @@ -98,7 +96,7 @@ movb -2(%esi,%ecx,1),%bl decl %ecx - jz LDone + jz LDone // for (i=0 ; i