Attachment #85207 for bug #130482

View | Details | Raw Unified | Return to bug 130482
Collapse All | Expand All

Lines 965-971 Link Here

(-)lsdldoom-1.4.4.4.orig1/src/d_deh.c (-1 / +1 lines)
965	// Prototypes for block processing functions	965	// Prototypes for block processing functions
966	// Pointers to these functions are used as the blocks are encountered.	966	// Pointers to these functions are used as the blocks are encountered.
967		967
968	void deh_procThing(DEHFILE , FILE, char *);	968	static void deh_procThing(DEHFILE fpin, FILE fpout, char *line);
969	void deh_procFrame(DEHFILE , FILE, char *);	969	void deh_procFrame(DEHFILE , FILE, char *);
970	void deh_procPointer(DEHFILE , FILE, char *);	970	void deh_procPointer(DEHFILE , FILE, char *);
971	void deh_procSounds(DEHFILE , FILE, char *);	971	void deh_procSounds(DEHFILE , FILE, char *);

Lines 47-52 Link Here

(-)lsdldoom-1.4.4.4.orig1/src/doomtype.h (+6 lines)
47	typedef signed long long int_64_t;	47	typedef signed long long int_64_t;
48	typedef unsigned long long uint_64_t;	48	typedef unsigned long long uint_64_t;
49		49
		50	#ifdef __GNUC__
		51	#define CONSTFUNC __attribute__((const))
		52	#else
		53	#define CONSTFUNC
		54	#endif
		55
50	/* CPhipps - use limits.h instead of depreciated values.h */	56	/* CPhipps - use limits.h instead of depreciated values.h */
51	#include <limits.h>	57	#include <limits.h>
52	#endif	58	#endif





 .text
 .align 8
// .globl R_DrawColumn_Normal
R_DrawColumn_Normal:

 pushl %ebp

//================

 .align 8
// .globl R_DrawTLColumn_Normal
R_DrawTLColumn_Normal:

 pushl %ebp

 ret

 .align 8
// .globl R_DrawColumn_HighRes
R_DrawColumn_HighRes:

 pushl %ebp

//================

 .align 8
// .globl R_DrawTLColumn_HighRes
R_DrawTLColumn_HighRes:

 pushl %ebp

Lines 44-50 Link Here

(-)lsdldoom-1.4.4.4.orig1/src/drawspan.S (-1 / +1 lines)
44		44
45	.text	45	.text
46	.align 8	46	.align 8
47	.globl R_DrawSpan	47	//.globl R_DrawSpan
48		48
49	R_DrawSpan:	49	R_DrawSpan:
50	pushl %ebp	50	pushl %ebp




/* killough 5/10/98: In djgpp, use inlined assembly for performance
 * CPhipps - made __inline__ to inline, as specified in the gcc docs
 * Also made const */
inline static CONSTFUNC fixed_t FixedMul(fixed_t a, fixed_t b)
{
  fixed_t result;
  int dummy;

 * killough 9/5/98: optimized to reduce the number of branches
 * CPhipps - made __inline__ to inline, as specified in the gcc docs
 * Also made const */
inline static CONSTFUNC fixed_t FixedDiv(fixed_t a, fixed_t b)
{
  if (abs(a) >> 14 < abs(b))
    {

#else /* I386_ASM */
/* CPhipps - made __inline__ to inline, as specified in the gcc docs
 * Also made const */
inline static CONSTFUNC fixed_t FixedDiv(fixed_t a, fixed_t b)
{
  return (abs(a)>>14) >= abs(b) ? ((a^b)>>31) ^ INT_MAX :
    (fixed_t)(((int_64_t) a << FRACBITS) / b);

 * FixedMod - returns a % b, guaranteeing 0<=a<b
 * (notice that the C standard for % does not guarantee this)
 */
inline static CONSTFUNC fixed_t FixedMod(fixed_t a, fixed_t b)
{
  if (b & (b-1)) {
    fixed_t r = a % b;





typedef boolean (*traverser_t)(intercept_t *in);

#ifdef __GNUC__
#define CONSTFUNC const
#else
#define CONSTFUNC
#endif

fixed_t CONSTFUNC P_AproxDistance (fixed_t dx, fixed_t dy);
int     CONSTFUNC P_PointOnLineSide (fixed_t x, fixed_t y, const line_t *line);
int     CONSTFUNC P_PointOnDivlineSide (fixed_t x, fixed_t y, 

Lines 41-51 Link Here

(-)lsdldoom-1.4.4.4.orig1/src/r_bsp.h (-5 lines)
41	extern line_t *linedef;	41	extern line_t *linedef;
42	extern sector_t *frontsector;	42	extern sector_t *frontsector;
43	extern sector_t *backsector;	43	extern sector_t *backsector;
44	extern int rw_x;
45	extern int rw_stopx;
46	extern boolean segtextured;
47	extern boolean markfloor; /* false if the back side is the same plane */
48	extern boolean markceiling;
49		44
50	/* old code -- killough:	45	/* old code -- killough:
51	* extern drawseg_t drawsegs[MAXDRAWSEGS];	46	* extern drawseg_t drawsegs[MAXDRAWSEGS];

Lines 383-388 Link Here

(-)lsdldoom-1.4.4.4.orig1/src/r_draw.c (+1 lines)
383	}	383	}
384	else	384	else
385	{	385	{
		386	if (heightmask == -1 && frac < 0) frac = 0;
386	while ((count-=2)>=0) // texture height is a power of 2 -- killough	387	while ((count-=2)>=0) // texture height is a power of 2 -- killough
387	{	388	{
388	dest = tranmap[(dest<<8)+colormap[source[(frac>>FRACBITS) & heightmask]]]; // phares	389	dest = tranmap[(dest<<8)+colormap[source[(frac>>FRACBITS) & heightmask]]]; // phares

Lines 116-122 Link Here

(-)lsdldoom-1.4.4.4.orig1/src/r_main.c (-2 / +2 lines)
116	// killough 5/2/98: reformatted	116	// killough 5/2/98: reformatted
117	//	117	//
118		118
119	const int R_PointOnSide(fixed_t x, fixed_t y, const node_t *node)	119	CONSTFUNC int R_PointOnSide(fixed_t x, fixed_t y, const node_t *node)
120	{	120	{
121	if (!node->dx)	121	if (!node->dx)
122	return x <= node->x ? node->dy > 0 : node->dy < 0;	122	return x <= node->x ? node->dy > 0 : node->dy < 0;
Lines 135-141 Link Here
135		135
136	// killough 5/2/98: reformatted	136	// killough 5/2/98: reformatted
137		137
138	const int R_PointOnSegSide(fixed_t x, fixed_t y, const seg_t *line)	138	CONSTFUNC int R_PointOnSegSide(fixed_t x, fixed_t y, const seg_t *line)
139	{	139	{
140	fixed_t lx = line->v1->x;	140	fixed_t lx = line->v1->x;
141	fixed_t ly = line->v1->y;	141	fixed_t ly = line->v1->y;

Lines 108-115 Link Here

(-)lsdldoom-1.4.4.4.orig1/src/r_main.h (-2 / +2 lines)
108	// Utility functions.	108	// Utility functions.
109	//	109	//
110		110
111	const int R_PointOnSide(fixed_t x, fixed_t y, const node_t *node);	111	CONSTFUNC int R_PointOnSide(fixed_t x, fixed_t y, const node_t *node);
112	const int R_PointOnSegSide(fixed_t x, fixed_t y, const seg_t *line);	112	CONSTFUNC int R_PointOnSegSide(fixed_t x, fixed_t y, const seg_t *line);
113	angle_t R_PointToAngle(fixed_t x, fixed_t y);	113	angle_t R_PointToAngle(fixed_t x, fixed_t y);
114	angle_t R_PointToAngle2(fixed_t x1, fixed_t y1, fixed_t x2, fixed_t y2);	114	angle_t R_PointToAngle2(fixed_t x1, fixed_t y1, fixed_t x2, fixed_t y2);
115	subsector_t *R_PointInSubsector(fixed_t x, fixed_t y);	115	subsector_t *R_PointInSubsector(fixed_t x, fixed_t y);

Return to bug 130482

Lines 41-47 Link Here

(-)lsdldoom-1.4.4.4.orig1/src/drawcol.S (-4 / +4 lines)
41		41
42	.text	42	.text
43	.align 8	43	.align 8
44	.globl R_DrawColumn_Normal	44	// .globl R_DrawColumn_Normal
45	R_DrawColumn_Normal:	45	R_DrawColumn_Normal:
46		46
47	pushl %ebp	47	pushl %ebp
Lines 196-202 Link Here
196	//================	196	//================
197		197
198	.align 8	198	.align 8
199	.globl R_DrawTLColumn_Normal	199	// .globl R_DrawTLColumn_Normal
200	R_DrawTLColumn_Normal:	200	R_DrawTLColumn_Normal:
201		201
202	pushl %ebp	202	pushl %ebp
Lines 386-392 Link Here
386	ret	386	ret
387		387
388	.align 8	388	.align 8
389	.globl R_DrawColumn_HighRes	389	// .globl R_DrawColumn_HighRes
390	R_DrawColumn_HighRes:	390	R_DrawColumn_HighRes:
391		391
392	pushl %ebp	392	pushl %ebp
Lines 540-546 Link Here
540	//================	540	//================
541		541
542	.align 8	542	.align 8
543	.globl R_DrawTLColumn_HighRes	543	// .globl R_DrawTLColumn_HighRes
544	R_DrawTLColumn_HighRes:	544	R_DrawTLColumn_HighRes:
545		545
546	pushl %ebp	546	pushl %ebp

Lines 63-69 Link Here

(-)lsdldoom-1.4.4.4.orig1/src/m_fixed.h (-4 / +4 lines)
63	/* killough 5/10/98: In djgpp, use inlined assembly for performance	63	/* killough 5/10/98: In djgpp, use inlined assembly for performance
64	* CPhipps - made __inline__ to inline, as specified in the gcc docs	64	* CPhipps - made __inline__ to inline, as specified in the gcc docs
65	* Also made const */	65	* Also made const */
66	inline static const fixed_t FixedMul(fixed_t a, fixed_t b)	66	inline static CONSTFUNC fixed_t FixedMul(fixed_t a, fixed_t b)
67	{	67	{
68	fixed_t result;	68	fixed_t result;
69	int dummy;	69	int dummy;
Lines 103-109 Link Here
103	* killough 9/5/98: optimized to reduce the number of branches	103	* killough 9/5/98: optimized to reduce the number of branches
104	* CPhipps - made __inline__ to inline, as specified in the gcc docs	104	* CPhipps - made __inline__ to inline, as specified in the gcc docs
105	* Also made const */	105	* Also made const */
106	inline static const fixed_t FixedDiv(fixed_t a, fixed_t b)	106	inline static CONSTFUNC fixed_t FixedDiv(fixed_t a, fixed_t b)
107	{	107	{
108	if (abs(a) >> 14 < abs(b))	108	if (abs(a) >> 14 < abs(b))
109	{	109	{
Lines 126-132 Link Here
126	#else /* I386_ASM */	126	#else /* I386_ASM */
127	/* CPhipps - made __inline__ to inline, as specified in the gcc docs	127	/* CPhipps - made __inline__ to inline, as specified in the gcc docs
128	* Also made const */	128	* Also made const */
129	inline static const fixed_t FixedDiv(fixed_t a, fixed_t b)	129	inline static CONSTFUNC fixed_t FixedDiv(fixed_t a, fixed_t b)
130	{	130	{
131	return (abs(a)>>14) >= abs(b) ? ((a^b)>>31) ^ INT_MAX :	131	return (abs(a)>>14) >= abs(b) ? ((a^b)>>31) ^ INT_MAX :
132	(fixed_t)(((int_64_t) a << FRACBITS) / b);	132	(fixed_t)(((int_64_t) a << FRACBITS) / b);
Lines 138-144 Link Here
138	* FixedMod - returns a % b, guaranteeing 0<=a<b	138	* FixedMod - returns a % b, guaranteeing 0<=a<b
139	* (notice that the C standard for % does not guarantee this)	139	* (notice that the C standard for % does not guarantee this)
140	*/	140	*/
141	inline static const fixed_t FixedMod(fixed_t a, fixed_t b)	141	inline static CONSTFUNC fixed_t FixedMod(fixed_t a, fixed_t b)
142	{	142	{
143	if (b & (b-1)) {	143	if (b & (b-1)) {
144	fixed_t r = a % b;	144	fixed_t r = a % b;

Lines 63-74 Link Here

(-)lsdldoom-1.4.4.4.orig1/src/p_maputl.h (-6 lines)
63		63
64	typedef boolean (traverser_t)(intercept_t in);	64	typedef boolean (traverser_t)(intercept_t in);
65		65
66	#ifdef __GNUC__
67	#define CONSTFUNC const
68	#else
69	#define CONSTFUNC
70	#endif
71
72	fixed_t CONSTFUNC P_AproxDistance (fixed_t dx, fixed_t dy);	66	fixed_t CONSTFUNC P_AproxDistance (fixed_t dx, fixed_t dy);
73	int CONSTFUNC P_PointOnLineSide (fixed_t x, fixed_t y, const line_t *line);	67	int CONSTFUNC P_PointOnLineSide (fixed_t x, fixed_t y, const line_t *line);
74	int CONSTFUNC P_PointOnDivlineSide (fixed_t x, fixed_t y,	68	int CONSTFUNC P_PointOnDivlineSide (fixed_t x, fixed_t y,