OS_Develop/FreeDOS
OS_Develop/FreeDOS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

code-mismatch: fix various kernel code discrepancies which break TURBO C build

Browse Source 
main issue is missing ASM attributes that C and asm code uses different names
correct long constant by standard suffix 'L' or 'UL'
This commit is contained in:
Jiri Malak 2024-07-09 17:31:55 +02:00 committed by Kenneth J Davis
parent c928849cea
commit 4ca28252da
7 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
kernel/config.c
View File

@ -62,7 +62,7 @@ STATIC struct MenuSelector MenuStruct[MENULINESMAX] BSS_INIT({0});
int nMenuLine BSS_INIT(0); int nMenuLine BSS_INIT(0);
int MenuColor = -1; int MenuColor = -1;
extern char kernel_command_line[256]; extern char ASM kernel_command_line[256];
extern int kernel_command_line_length; extern int kernel_command_line_length;
STATIC void WriteMenuLine(struct MenuSelector *menu) STATIC void WriteMenuLine(struct MenuSelector *menu)

4
kernel/dosfns.c
View File

@ -921,12 +921,12 @@ COUNT DosGetExtFree(BYTE FAR * DriveString, struct xfreespace FAR * xfsp)
total = (((UDWORD)rg[0] << 16UL) | rg[1]); total = (((UDWORD)rg[0] << 16UL) | rg[1]);
avail = (((UDWORD)rg[2] << 16UL) | rg[3]); avail = (((UDWORD)rg[2] << 16UL) | rg[3]);
while (total > 0x00ffffff && spc < 128) { while (total > 0x00ffffffUL && spc < 128) {
spc *= 2; spc *= 2;
avail /= 2; avail /= 2;
total /= 2; total /= 2;
} }
while (total > 0x00ffffff && bps < 32768) { while (total > 0x00ffffffUL && bps < 32768UL) {
bps *= 2; bps *= 2;
avail /= 2; avail /= 2;
total /= 2; total /= 2;

2
kernel/init-mod.h
View File

@ -38,7 +38,7 @@
#define BSS_INIT(x) #define BSS_INIT(x)
#endif #endif
extern struct _KernelConfig InitKernelConfig; extern struct _KernelConfig ASM InitKernelConfig;
/* /*
* Functions in `INIT_TEXT' may need to call functions in `_TEXT'. The entry * Functions in `INIT_TEXT' may need to call functions in `_TEXT'. The entry

2
kernel/initdisk.c
View File

@ -714,7 +714,7 @@ STATIC int LBA_Get_Drive_Parameters(int drive, struct DriveParamS *driveParam, i
else else
{ {
if (firstPass) printf("Drive %02x is too large to handle, restricted to 2TB\n", drive); if (firstPass) printf("Drive %02x is too large to handle, restricted to 2TB\n", drive);
driveParam->total_sectors = 0xffffffffu; driveParam->total_sectors = 0xffffffffUL;
} }
/* if we arrive here, mark drive as LBA capable */ /* if we arrive here, mark drive as LBA capable */

4
kernel/inthndlr.c
View File

@ -1916,7 +1916,7 @@ struct int2f12regs {
UWORD callerARG1; /* used if called from INT2F/12 */ UWORD callerARG1; /* used if called from INT2F/12 */
}; };
extern intvec BIOSInt13, UserInt13, BIOSInt19; extern intvec ASM BIOSInt13, ASM UserInt13, ASM BIOSInt19;
/* WARNING: modifications in `r' are used outside of int2F_12_handler() /* WARNING: modifications in `r' are used outside of int2F_12_handler()
@ -2405,7 +2405,7 @@ VOID ASMCFUNC int2F_12_handler(struct int2f12regs FAR *pr)
if (cdsp->cdsFlags) if (cdsp->cdsFlags)
{ {
TempCDS.cdsDpb = cdsp->cdsDpb; TempCDS.cdsDpb = cdsp->cdsDpb;
TempCDS.cdsFlags = CDSPHYSDRV; // don't inherit CDS flags TempCDS.cdsFlags = CDSPHYSDRV; /* don't inherit CDS flags */
} }
else else
{ {

6
kernel/main.c
View File

@ -68,10 +68,10 @@ __segment DosTextSeg = 0;
struct lol FAR *LoL = &DATASTART; struct lol FAR *LoL = &DATASTART;
struct _KernelConfig InitKernelConfig = { -1 }; struct _KernelConfig ASM InitKernelConfig = { -1 };
char kernel_command_line[256] = { 0, -1 }; /* special none value */ char ASM kernel_command_line[256] = { 0, -1 }; /* special none value */
int kernel_command_line_length BSS_INIT(0); int kernel_command_line_length BSS_INIT(0);
UBYTE debugger_present = 0xFF; /* initialised in kernel.asm UBYTE ASM debugger_present = 0xFF; /* initialised in kernel.asm
do NOT set 0 here or compiler may do NOT set 0 here or compiler may
move it into bss that we zero out */ move it into bss that we zero out */

2
sys/sys.c
View File

@ -1505,7 +1505,7 @@ void put_boot(SYSOptions *opts)
clusters = dataSectors / (((bs32->bsSecPerClust - 1) & 0xFF) + 1); clusters = dataSectors / (((bs32->bsSecPerClust - 1) & 0xFF) + 1);
if (bs32->bsFATsecs == 0) { if (bs32->bsFATsecs == 0) {
if (clusters >= 0xFFFfff5) { /* FAT32 has 28 significant bits */ if (clusters >= 0xFFFfff5UL) { /* FAT32 has 28 significant bits */
printf("Too many clusters (%lXh) for FAT32 file system!\n", clusters); printf("Too many clusters (%lXh) for FAT32 file system!\n", clusters);
exit(1); exit(1);
} }