tyler.durden/kernel
1
0
Fork 0
mirror of https://github.com/FDOS/kernel.git synced 2025-07-25 06:45:10 +02:00
Code Issues Packages Projects Releases Wiki Activity

ensure f_nodes.f_count are initialized to 0 (always clear KernelAlloc'd memory),

Browse Source 
and add some debug messages


git-svn-id: https://svn.code.sf.net/p/freedos/svn/kernel/branches/UNSTABLE@1100 6ac86273-5f31-0410-b378-82cca8765d1b
This commit is contained in:
Kenneth J Davis 2005-01-29 20:20:03 +00:00
parent a7a1b4ff1e
commit 29dc31dfe2
1 changed files with 31 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

81
kernel/config.c
View File

@ -30,6 +30,7 @@
#include "portab.h" #include "portab.h"
#include "init-mod.h" #include "init-mod.h"
#include "dyndata.h" #include "dyndata.h"
#include "debug.h"
#ifdef VERSION_STRINGS #ifdef VERSION_STRINGS
static BYTE *RcsId = static BYTE *RcsId =
@ -38,12 +39,6 @@ static BYTE *RcsId =
#define testbit(v,bit) ((UBYTE)((v) >> (UBYTE)(bit)) & 1) #define testbit(v,bit) ((UBYTE)((v) >> (UBYTE)(bit)) & 1)
#ifdef DEBUG
#define DebugPrintf(x) printf x
#else
#define DebugPrintf(x)
#endif
static UBYTE MenuColor BSS_INIT(0); static UBYTE MenuColor BSS_INIT(0);
static unsigned screenwidth(void) static unsigned screenwidth(void)
@ -249,6 +244,8 @@ enum { UMB_NONE, /* do nothing */
UMB_REQ, /* DOS=UMB detected */ UMB_REQ, /* DOS=UMB detected */
}; };
enum {LOC_CONV=0, LOC_HMA=1}; /* dup in global.h */
static UBYTE HMAState BSS_INIT(HMA_NONE); static UBYTE HMAState BSS_INIT(HMA_NONE);
static UBYTE UmbState BSS_INIT(UMB_NONE); static UBYTE UmbState BSS_INIT(UMB_NONE);
@ -258,20 +255,15 @@ void PreConfig(void)
{ {
/* Initialize the base memory pointers */ /* Initialize the base memory pointers */
#ifdef DEBUG CfgDbgPrintf(("SDA located at 0x%p\n", internal_data));
{
printf("SDA located at 0x%p\n", internal_data);
}
#endif
/* Begin by initializing our system buffers */ /* Begin by initializing our system buffers */
#ifdef DEBUG
/* printf("Preliminary %d buffers allocated at 0x%p\n", Config.cfgBuffers, buffers);*/
#endif
LoL->DPBp = LoL->DPBp =
DynAlloc("DPBp", blk_dev.dh_name[0], sizeof(struct dpb)); DynAlloc("DPBp", blk_dev.dh_name[0], sizeof(struct dpb));
/* Initialize the file table */ /* Initialize the file table */
CfgDbgPrintf(("Initializing fnodes\n"));
config_init_fnodes(Config.cfgFiles); config_init_fnodes(Config.cfgFiles);
LoL->sfthead = MK_PTR(struct sfttbl, FP_SEG(LoL), 0xcc); /* &(LoL->firstsftt) */ LoL->sfthead = MK_PTR(struct sfttbl, FP_SEG(LoL), 0xcc); /* &(LoL->firstsftt) */
@ -284,19 +276,14 @@ void PreConfig(void)
LoL->CDSp = KernelAlloc(sizeof(struct cds) * LoL->lastdrive, 'L', 0); LoL->CDSp = KernelAlloc(sizeof(struct cds) * LoL->lastdrive, 'L', 0);
#ifdef DEBUG CfgDbgPrintf(("Preliminary:\n f_node 0x%p\n", LoL->f_nodes));
printf("Preliminary:\n f_node 0x%p\n", LoL->f_nodes); /* CfgDbgPrintf((" FCB table 0x%p\n",LoL->FCBp));*/
/* printf(" FCB table 0x%p\n",LoL->FCBp);*/ CfgDbgPrintf((" CDS table 0x%p\n", LoL->CDSp));
printf(" sft table 0x%p\n", LoL->sfthead); CfgDbgPrintf((" DPB table 0x%p\n", LoL->DPBp));
printf(" CDS table 0x%p\n", LoL->CDSp);
printf(" DPB table 0x%p\n", LoL->DPBp);
#endif
/* Done. Now initialize the MCB structure */ /* Done. Now initialize the MCB structure */
/* This next line is 8086 and 80x86 real mode specific */ /* This next line is 8086 and 80x86 real mode specific */
#ifdef DEBUG CfgDbgPrintf(("Preliminary allocation completed: top at %p\n", lpTop));
printf("Preliminary allocation completed: top at %p\n", lpTop);
#endif
/* initialize environment */ /* initialize environment */
fmemcpy(MK_PTR(char, DOS_PSP + 8, 0), master_env, sizeof(master_env)); fmemcpy(MK_PTR(char, DOS_PSP + 8, 0), master_env, sizeof(master_env));
@ -379,16 +366,14 @@ void PostConfig(void)
LoL->lastdrive = drv; LoL->lastdrive = drv;
} }
DebugPrintf(("starting FAR allocations at %x\n", base_seg)); CfgDbgPrintf(("starting FAR allocations at %x\n", base_seg));
/* Initialize the file table */ /* Initialize the file table */
config_init_fnodes(Config.cfgFiles); config_init_fnodes(Config.cfgFiles);
/* Begin by initializing our system buffers */ /* Begin by initializing our system buffers */
/* dma_scratch = (BYTE FAR *) KernelAllocDma(BUFFERSIZE); */ /* dma_scratch = (BYTE FAR *) KernelAllocDma(BUFFERSIZE); */
#ifdef DEBUG /* CfgDbgPrintf(("DMA scratchpad allocated at 0x%p\n", dma_scratch)); */
/* printf("DMA scratchpad allocated at 0x%p\n", dma_scratch); */
#endif
config_init_buffers(Config.cfgBuffers); config_init_buffers(Config.cfgBuffers);
@ -404,13 +389,10 @@ void PostConfig(void)
LoL->CDSp = KernelAlloc(sizeof(struct cds) * LoL->lastdrive, 'L', Config.cfgLastdriveHigh); LoL->CDSp = KernelAlloc(sizeof(struct cds) * LoL->lastdrive, 'L', Config.cfgLastdriveHigh);
#ifdef DEBUG CfgDbgPrintf(("Final: \n f_node 0x%p\n", LoL->f_nodes));
printf("Final: \n f_node 0x%p\n", LoL->f_nodes);
/* printf(" FCB table 0x%p\n",LoL->FCBp);*/ /* printf(" FCB table 0x%p\n",LoL->FCBp);*/
printf(" sft table 0x%p\n", LoL->sfthead->sftt_next); CfgDbgPrintf((" CDS table 0x%p\n", LoL->CDSp));
printf(" CDS table 0x%p\n", LoL->CDSp); CfgDbgPrintf((" DPB table 0x%p\n", LoL->DPBp));
printf(" DPB table 0x%p\n", LoL->DPBp);
#endif
if (Config.cfgStacks) if (Config.cfgStacks)
{ {
@ -419,9 +401,9 @@ void PostConfig(void)
Config.cfgStacksHigh); Config.cfgStacksHigh);
init_stacks(stackBase, Config.cfgStacks, Config.cfgStackSize); init_stacks(stackBase, Config.cfgStacks, Config.cfgStackSize);
DebugPrintf(("Stacks allocated at %p\n", stackBase)); CfgDbgPrintf(("Stacks allocated at %p\n", stackBase));
} }
DebugPrintf(("Allocation completed: top at 0x%x\n", base_seg)); CfgDbgPrintf(("Allocation completed: top at 0x%x\n", base_seg));
} }
@ -433,21 +415,17 @@ VOID configDone(VOID)
if (HMAState != HMA_DONE) if (HMAState != HMA_DONE)
{ {
#ifdef DEBUG register size_t hma_paras = (HMAFree + 15) / 16;
size_t hma_paras = (HMAFree + 15) / 16;
seg_t kernel_seg = allocmem(hma_paras); seg_t kernel_seg = allocmem(hma_paras);
#else
seg_t kernel_seg = allocmem((HMAFree + 15) / 16);
#endif
mcb _seg *p = MK_SEG_PTR(mcb, kernel_seg - 1); mcb _seg *p = MK_SEG_PTR(mcb, kernel_seg - 1);
p->m_name[0] = 'S'; p->m_name[0] = 'S';
p->m_name[1] = 'C'; p->m_name[1] = 'C';
p->m_psp = 8; p->m_psp = 8;
DebugPrintf(("HMA not available, moving text to %x\n", kernel_seg)); CfgDbgPrintf(("HMA not available, moving text to %x\n", kernel_seg));
MoveKernel(kernel_seg); MoveKernel(kernel_seg);
DebugPrintf(("kernel is low, start alloc at %x\n", CfgDbgPrintf(("kernel is low, start alloc at %x\n",
kernel_seg + hma_paras + 1)); kernel_seg + hma_paras + 1));
} }
@ -616,15 +594,15 @@ static void DoConfig_(void)
/*strcpy (configfile, "FDCONFIG.SYS");*/ /*strcpy (configfile, "FDCONFIG.SYS");*/
if ((nFileDesc = open(configfile, 0)) < 0) if ((nFileDesc = open(configfile, 0)) < 0)
{ {
DebugPrintf(("%s not found\n", configfile)); CfgDbgPrintf(("%s not found\n", configfile));
strcpy (configfile, "CONFIG.SYS"); strcpy (configfile, "CONFIG.SYS");
if ((nFileDesc = open(configfile, 0)) < 0) if ((nFileDesc = open(configfile, 0)) < 0)
{ {
DebugPrintf(("%s not found\n", configfile)); CfgDbgPrintf(("%s not found\n", configfile));
return; return;
} }
} }
DebugPrintf(("Reading %s...\n", configfile)); CfgDbgPrintf(("Reading %s...\n", configfile));
/* Read each line into the buffer and then parse the line, */ /* Read each line into the buffer and then parse the line, */
/* do the table lookup and execute the handler for that */ /* do the table lookup and execute the handler for that */
@ -1541,11 +1519,14 @@ void _seg * KernelAlloc(size_t nBytes, UBYTE type, int mode)
{ {
/* prealloc */ /* prealloc */
/* note: lpTop is already para-aligned */ /* note: lpTop is already para-aligned */
return alignNextPara(lpTop = MK_FP(FP_SEG(lpTop) - nPara, FP_OFF(lpTop))); p = alignNextPara(lpTop = MK_FP(FP_SEG(lpTop) - nPara, FP_OFF(lpTop)));
} }
else
p = KernelAllocPara(nPara, type, NULL, mode); {
fmemset(p, 0, nBytes); p = KernelAllocPara(nPara, type, NULL, mode);
}
fmemset(p, 0x0, nBytes);
return p; return p;
} }