Skip to content
This repository has been archived by the owner on Jan 14, 2020. It is now read-only.

Second round of Linux 64-bit fixes. #54

Closed
wants to merge 8 commits into from
Closed

Second round of Linux 64-bit fixes. #54

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
64e89c5
64-bit: Fix initial segfaults.
rohit-n Feb 6, 2019
35587cf
64-bit: Fix rhlineasm4. "logo.anm" now plays without crashing.
rohit-n Feb 11, 2019
a7d4057
64-bit: Free long descriptors.
rohit-n Feb 24, 2019
f943c73
64-bit: Fix immediate engine related crashes.
rohit-n Mar 13, 2019
b64f0d3
64-bit: Fix automap crash in some cases.
rohit-n Mar 15, 2019
eb7b83e
64-bit: Fix automap crash in other cases.
rohit-n Mar 18, 2019
d85cf36
64-bit: Fix game-related crashes and bugs.
rohit-n Mar 18, 2019
feffe62
64-bit: Use "long" instead of "intptr_t".
rohit-n Mar 18, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
61 changes: 31 additions & 30 deletions Engine/src/draw.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ static int transrev = 0;

/* --------------- WALLS RENDERING METHOD (USED TO BE HIGHLY OPTIMIZED ASSEMBLY) ----------------------------*/
extern int32_t asm1;
extern intptr_t asm2;
extern long asm2;
extern uint8_t *asm3;
extern int32_t asm4;

Expand Down Expand Up @@ -90,9 +90,9 @@ void hlineasm4(int32_t numPixels, int32_t shade, uint32_t i4, uint32_t i5, uint8
static int32_t rmach_eax;
static int32_t rmach_ebx;
static int32_t rmach_ecx;
static int32_t rmach_edx;
static long rmach_edx;
static int32_t rmach_esi;
void setuprhlineasm4(int32_t i1, int32_t i2, int32_t i3, int32_t i4, int32_t i5, int32_t i6)
void setuprhlineasm4(int32_t i1, int32_t i2, int32_t i3, long i4, int32_t i5, int32_t i6)
{
rmach_eax = i1;
rmach_ebx = i2;
Expand All @@ -102,11 +102,11 @@ void setuprhlineasm4(int32_t i1, int32_t i2, int32_t i3, int32_t i4, int32_t i5,
}


void rhlineasm4(int32_t i1, uint8_t* texture, int32_t i3, uint32_t i4, uint32_t i5, int32_t dest)
void rhlineasm4(int32_t i1, uint8_t* texture, int32_t i3, uint32_t i4, uint32_t i5, uint8_t* dest)
{
uint32_t ebp = dest - i1;
uint32_t rmach6b = ebp-1;
int32_t numPixels;
int32_t offset = i1 + 1;

if (i1 <= 0) return;

Expand All @@ -129,7 +129,7 @@ void rhlineasm4(int32_t i1, uint8_t* texture, int32_t i3, uint32_t i4, uint32_t
i1 = ((i1&0xffffff00)|(((uint8_t *)i3)[rmach_edx]));

if (pixelsAllowed-- > 0)
((uint8_t *)rmach6b)[numPixels] = (i1&0xff);
dest[numPixels - offset] = (i1&0xff);

texture -= ebp;
numPixels--;
Expand All @@ -139,9 +139,9 @@ void rhlineasm4(int32_t i1, uint8_t* texture, int32_t i3, uint32_t i4, uint32_t
static int32_t rmmach_eax;
static int32_t rmmach_ebx;
static int32_t rmmach_ecx;
static int32_t rmmach_edx;
static long rmmach_edx;
static int32_t setupTileHeight;
void setuprmhlineasm4(int32_t i1, int32_t i2, int32_t i3, int32_t i4, int32_t tileHeight, int32_t i6)
void setuprmhlineasm4(int32_t i1, int32_t i2, int32_t i3, long i4, int32_t tileHeight, int32_t i6)
{
rmmach_eax = i1;
rmmach_ebx = i2;
Expand All @@ -152,11 +152,11 @@ void setuprmhlineasm4(int32_t i1, int32_t i2, int32_t i3, int32_t i4, int32_t ti


//FCS: ????
void rmhlineasm4(int32_t i1, intptr_t shade, int32_t colorIndex, int32_t i4, int32_t i5, int32_t dest)
void rmhlineasm4(int32_t i1, uint8_t* shade, int32_t colorIndex, int32_t i4, int32_t i5, uint8_t* dest)
{
uint32_t ebp = dest - i1;
uint32_t rmach6b = ebp-1;
int32_t numPixels;
int32_t offset = i1 + 1;

if (i1 <= 0)
return;
Expand All @@ -183,7 +183,7 @@ void rmhlineasm4(int32_t i1, intptr_t shade, int32_t colorIndex, int32_t i4, int
if (pixelsAllowed-- > 0)
{
i1 = ((i1&0xffffff00)|(((uint8_t *)colorIndex)[rmmach_edx]));
((uint8_t *)rmach6b)[numPixels] = (i1&0xff);
dest[numPixels - offset] = (i1&0xff);
}
}

Expand Down Expand Up @@ -295,25 +295,25 @@ int32_t tvlineasm1(int32_t i1, uint8_t * texture, int32_t numPixels, int32_t i4


static uint8_t tran2shr;
static uint32_t tran2pal_ebx;
static uint32_t tran2pal_ecx;
void setuptvlineasm2(int32_t i1, int32_t i2, int32_t i3)
static unsigned long tran2pal_ebx;
static unsigned long tran2pal_ecx;
void setuptvlineasm2(int32_t i1, long i2, long i3)
{
tran2shr = (i1&0x1f);
tran2pal_ebx = i2;
tran2pal_ecx = i3;
} /* */


void tvlineasm2(uint32_t i1, uint32_t i2, uintptr_t i3, uintptr_t i4, uint32_t i5, uintptr_t i6)
void tvlineasm2(uint32_t i1, uint32_t i2, unsigned long i3, unsigned long i4, uint32_t i5, unsigned long i6)
{
uint32_t ebp = i1;
uint32_t tran2inca = i2;
uint32_t tran2incb = asm1;
uintptr_t tran2bufa = i3;
uintptr_t tran2bufb = i4;
uintptr_t tran2edi = asm2;
uintptr_t tran2edi1 = asm2 + 1;
unsigned long tran2bufa = i3;
unsigned long tran2bufb = i4;
unsigned long tran2edi = asm2;
unsigned long tran2edi1 = asm2 + 1;

i6 -= asm2;

Expand Down Expand Up @@ -400,7 +400,7 @@ void setupvlineasm(int32_t i1)
}

//FCS This is used to fill the inside of a wall (so it draws VERTICAL column, always).
void vlineasm4(int32_t columnIndex, intptr_t framebuffer)
void vlineasm4(int32_t columnIndex, long framebuffer)
{

if (!RENDER_DRAW_WALL_INSIDE)
Expand All @@ -410,7 +410,7 @@ void vlineasm4(int32_t columnIndex, intptr_t framebuffer)
int i;
uint32_t temp;

uintptr_t index = (framebuffer + ylookup[columnIndex]);
unsigned long index = (framebuffer + ylookup[columnIndex]);
uint8_t *dest= (uint8_t *)(-ylookup[columnIndex]);
//uint8_t *dest= (uint8_t *)framebuffer;

Expand Down Expand Up @@ -440,11 +440,11 @@ void setupmvlineasm(int32_t i1)
}


void mvlineasm4(int32_t column, intptr_t framebufferOffset)
void mvlineasm4(int32_t column, long framebufferOffset)
{
int i;
uint32_t temp;
uintptr_t index = (framebufferOffset + ylookup[column]);
unsigned long index = (framebufferOffset + ylookup[column]);
uint8_t *dest = (uint8_t *)(-ylookup[column]);

do {
Expand Down Expand Up @@ -821,14 +821,14 @@ void tsethlineshift(int32_t i1, int32_t i2)



static intptr_t slopemach_ebx;
static long slopemach_ebx;
static int32_t slopemach_ecx;
static int32_t slopemach_edx;
static long slopemach_edx;
static uint8_t slopemach_ah1;
static uint8_t slopemach_ah2;
static float asm2_f;
typedef union { unsigned int i; float f; } bitwisef2i;
void setupslopevlin(int32_t i1, intptr_t i2, int32_t i3)
void setupslopevlin(int32_t i1, long i2, int32_t i3)
{
bitwisef2i c;
slopemach_ebx = i2;
Expand All @@ -848,10 +848,11 @@ extern int32_t fpuasm;
#define high32(a) ((int)(((__int64)a&(__int64)0xffffffff00000000)>>32))

//FCS: Render RENDER_SLOPPED_CEILING_AND_FLOOR
void slopevlin(intptr_t i1, uint32_t i2, int32_t i3, int32_t i4, int32_t i5, int32_t i6)
void slopevlin(long i1, uint32_t i2, long* i3, uint32_t index, int32_t i4, int32_t i5, int32_t i6)
{
bitwisef2i c;
uint32_t ecx,eax,ebx,edx,esi,edi;
unsigned long ecx,eax,ebx,edx,esi;
uint32_t edi;
//This is so bad to cast asm3 to int then float :( !!!
float a = (float)(int32_t) asm3 + asm2_f;
i1 -= slopemach_ecx;
Expand Down Expand Up @@ -898,8 +899,8 @@ void slopevlin(intptr_t i1, uint32_t i2, int32_t i3, int32_t i4, int32_t i5, int
edi += eax;
i1 += slopemach_ecx;
edx = ((edx&0xffffff00)|((((uint8_t *)(ebx+edx))[slopemach_ebx])));
ebx = *((uint32_t*)i3); // register trickery
i3 -= 4;
ebx = i3[index];
index--;
eax = ((eax&0xffffff00)|(*((uint8_t *)(ebx+edx))));
ebx = esi;

Expand Down
24 changes: 12 additions & 12 deletions Engine/src/draw.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,32 +27,32 @@ extern uint8_t *transluc;
extern uint8_t *globalpalwritten;
extern int16_t globalshiftval;
extern int32_t vplce[4], vince[4];
extern intptr_t bufplce[4];
extern long bufplce[4];
extern uint8_t* palookupoffse[4];

void sethlinesizes(int32_t,int32_t,uint8_t *);


void hlineasm4(int32_t,int32_t,uint32_t,uint32_t,uint8_t*);
void setuprhlineasm4(int32_t,int32_t,int32_t,int32_t,int32_t,int32_t);
void rhlineasm4(int32_t,uint8_t*,int32_t,uint32_t,uint32_t,int32_t);
void setuprmhlineasm4(int32_t,int32_t,int32_t,int32_t,int32_t,int32_t);
void rmhlineasm4(int32_t,intptr_t,int32_t,int32_t,int32_t,int32_t);
void setuprhlineasm4(int32_t,int32_t,int32_t,long,int32_t,int32_t);
void rhlineasm4(int32_t,uint8_t*,int32_t,uint32_t,uint32_t,uint8_t*);
void setuprmhlineasm4(int32_t,int32_t,int32_t,long,int32_t,int32_t);
void rmhlineasm4(int32_t,uint8_t*,int32_t,int32_t,int32_t,uint8_t*);


void setBytesPerLine(int32_t);

int32_t prevlineasm1(int32_t,uint8_t* palette ,int32_t,int32_t,uint8_t *,uint8_t *);
int32_t vlineasm1(int32_t,uint8_t*,int32_t,int32_t,uint8_t *,uint8_t*);

int32_t tvlineasm1(int32_t,uint8_t *,int32_t,int32_t,uint8_t *,uint8_t * dest);
void setuptvlineasm2(int32_t,int32_t,int32_t);
void tvlineasm2(uint32_t,uint32_t,uintptr_t,uintptr_t,uint32_t,uintptr_t);
int32_t tvlineasm1(int32_t,uint8_t*,int32_t,int32_t,uint8_t *,uint8_t * dest);
void setuptvlineasm2(int32_t,long,long);
void tvlineasm2(uint32_t,uint32_t,unsigned long,unsigned long,uint32_t,unsigned long);
int32_t mvlineasm1(int32_t,uint8_t*,int32_t,int32_t,uint8_t* texture,uint8_t* dest);
void setupvlineasm(int32_t);
void vlineasm4(int32_t,intptr_t);
void vlineasm4(int32_t,long);
void setupmvlineasm(int32_t);
void mvlineasm4(int32_t,intptr_t);
void mvlineasm4(int32_t,long);
void setupspritevline(int32_t,int32_t,int32_t,int32_t,int32_t,int32_t);
void spritevline(int32_t,uint32_t,int32_t,uint32_t,uint8_t*,uint8_t*);
void msetupspritevline(int32_t,int32_t,int32_t,int32_t,int32_t,int32_t);
Expand All @@ -65,8 +65,8 @@ void msethlineshift(int32_t,int32_t);
void thline(uint8_t*,int32_t,int32_t,int32_t,int32_t,uint8_t *);
void thlineskipmodify(int32_t,uint32_t,uint32_t,int32_t,int32_t,uint8_t *);
void tsethlineshift(int32_t,int32_t);
void setupslopevlin(int32_t,intptr_t,int32_t);
void slopevlin(intptr_t,uint32_t,int32_t,int32_t,int32_t,int32_t);
void setupslopevlin(int32_t,long,int32_t);
void slopevlin(long,uint32_t,long*,uint32_t,int32_t,int32_t,int32_t);


#define TRANS_NORMAL 0
Expand Down
Loading