tyler.durden/kernel
1
0
Fork 0
mirror of https://github.com/FDOS/kernel.git synced 2025-07-23 22:04:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

* add support for the far jmp at "int 30" (0000:00c0)

Browse Source 
* mirror it for the HMA (ffff:00d0)
* put all DOS int handler (and the CPM entry jumped to from int30)
  jumpers in the "CONST" portion of DGROUP (instead of LGROUP)
  This helps Turbo C++ 1.01 make with the -S (swap) switch.
* adjustments to set the relevant PSP fields in task.c


git-svn-id: https://svn.code.sf.net/p/freedos/svn/kernel/trunk@694 6ac86273-5f31-0410-b378-82cca8765d1b
This commit is contained in:
Bart Oldeman 2003-09-16 12:38:02 +00:00
parent 7c241c59c6
commit 2f4e2d3a69
7 changed files with 44 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hdr/portab.h
View File

@ -226,8 +226,12 @@ typedef signed long LONG;
#define pokeb(seg, ofs, b) (*((unsigned char far *)MK_FP(seg,ofs)) = b) #define pokeb(seg, ofs, b) (*((unsigned char far *)MK_FP(seg,ofs)) = b)
#define poke(seg, ofs, w) (*((unsigned far *)MK_FP(seg,ofs)) = w) #define poke(seg, ofs, w) (*((unsigned far *)MK_FP(seg,ofs)) = w)
#define pokew poke
#define pokel(seg, ofs, l) (*((unsigned long far *)MK_FP(seg,ofs)) = l)
#define peekb(seg, ofs) (*((unsigned char far *)MK_FP(seg,ofs))) #define peekb(seg, ofs) (*((unsigned char far *)MK_FP(seg,ofs)))
#define peek(seg, ofs) (*((unsigned far *)MK_FP(seg,ofs))) #define peek(seg, ofs) (*((unsigned far *)MK_FP(seg,ofs)))
#define peekw peek
#define peekl(seg, ofs) (*((unsigned long far *)MK_FP(seg,ofs)))
#if defined(__TURBOC__) && (__TURBOC__ > 0x202) #if defined(__TURBOC__) && (__TURBOC__ > 0x202)
#define FP_SEG(fp) ((unsigned)(void _seg *)(void far *)(fp)) #define FP_SEG(fp) ((unsigned)(void _seg *)(void far *)(fp))

5
hdr/process.h
View File

@ -62,8 +62,9 @@ typedef struct {
#define load ldata._load #define load ldata._load
typedef struct { typedef struct {
UWORD ps_exit; /* 00 CP/M-like exit poimt */ UWORD ps_exit; /* 00 CP/M-like exit point: int 20 */
UWORD ps_size; /* 02 memory size in paragraphs */ UWORD ps_size; /* 02 segment of first byte beyond */
/* memory allocated to program */
BYTE ps_fill1; /* 04 single char fill */ BYTE ps_fill1; /* 04 single char fill */
/* CP/M-like entry point */ /* CP/M-like entry point */

1
kernel/init-mod.h
View File

@ -183,6 +183,7 @@ VOID ASMCFUNC FAR int28_handler(void);
VOID ASMCFUNC FAR int29_handler(void); VOID ASMCFUNC FAR int29_handler(void);
VOID ASMCFUNC FAR int2a_handler(void); VOID ASMCFUNC FAR int2a_handler(void);
VOID ASMCFUNC FAR int2f_handler(void); VOID ASMCFUNC FAR int2f_handler(void);
VOID ASMCFUNC FAR cpm_entry(void);
/* main.c */ /* main.c */
VOID ASMCFUNC FreeDOSmain(void); VOID ASMCFUNC FreeDOSmain(void);

7
kernel/inithma.c
View File

@ -408,6 +408,13 @@ void MoveKernel(unsigned NewKernelSegment)
rp->jmpSegment = NewKernelSegment; rp->jmpSegment = NewKernelSegment;
} }
if (NewKernelSegment == 0xffff)
{
/* jmp far cpm_entry (copy from 0:c0) */
pokeb(0xffff, 0x30 * 4 + 0x10, 0xea);
pokel(0xffff, 0x30 * 4 + 0x11, (ULONG)cpm_entry);
}
} }
CurrentKernelSegment = NewKernelSegment; CurrentKernelSegment = NewKernelSegment;

16
kernel/kernel.asm
View File

@ -718,6 +718,10 @@ begin_hma:
times 20h db 0 times 20h db 0
db 0 db 0
; to minimize relocations
global _DGROUP_
_DGROUP_ dw DGROUP
%ifdef WATCOM %ifdef WATCOM
; 32 bit multiplication + division ; 32 bit multiplication + division
global __U4M global __U4M
@ -728,6 +732,10 @@ __U4D:
LDIVMODU LDIVMODU
%endif %endif
resb 0xd0 - ($-begin_hma)
; reserve space for far jump to cp/m routine
resb 5
;End of HMA segment ;End of HMA segment
segment HMA_TEXT_END segment HMA_TEXT_END
global __HMATextEnd global __HMATextEnd
@ -744,7 +752,7 @@ segment _STACK class=STACK stack
segment _LOWTEXT segment CONST
; dummy interrupt return handlers ; dummy interrupt return handlers
global _int22_handler global _int22_handler
@ -931,7 +939,6 @@ noNeedToDisable:
iret iret
segment _LOWTEXT
; ;
; Default Int 24h handler -- always returns fail ; Default Int 24h handler -- always returns fail
; so we have not to relocate it (now) ; so we have not to relocate it (now)
@ -946,11 +953,6 @@ _int24_handler: mov al,FAIL
; this makes some things easier ; this makes some things easier
; ;
; to minimize relocations
segment HMA_TEXT
global _DGROUP_
_DGROUP_ dw DGROUP
segment _LOWTEXT segment _LOWTEXT
global _TEXT_DGROUP global _TEXT_DGROUP
_TEXT_DGROUP dw DGROUP _TEXT_DGROUP dw DGROUP

2
kernel/main.c
View File

@ -215,6 +215,8 @@ STATIC void init_kernel(void)
setvec(0x28, int28_handler); setvec(0x28, int28_handler);
setvec(0x2a, int2a_handler); setvec(0x2a, int2a_handler);
setvec(0x2f, int2f_handler); setvec(0x2f, int2f_handler);
pokeb(0, 0x30 * 4, 0xea);
pokel(0, 0x30 * 4 + 1, (ULONG)cpm_entry);
init_PSPSet(DOS_PSP); init_PSPSet(DOS_PSP);
set_DTA(MK_FP(DOS_PSP, 0x80)); set_DTA(MK_FP(DOS_PSP, 0x80));

31
kernel/task.c
View File

@ -171,9 +171,9 @@ void new_psp(seg para, int psize)
/* CP/M-like exit point */ /* CP/M-like exit point */
p->ps_exit = 0x20cd; p->ps_exit = 0x20cd;
/* CP/M-like entry point - jump to special entry */ /* CP/M-like entry point - call far to special entry */
p->ps_farcall = 0xea; p->ps_farcall = 0x9a;
p->ps_reentry = cpm_entry; p->ps_reentry = MK_FP(0, 0x30 * 4);
/* unix style call - 0xcd 0x21 0xcb (int 21, retf) */ /* unix style call - 0xcd 0x21 0xcb (int 21, retf) */
p->ps_unix[0] = 0xcd; p->ps_unix[0] = 0xcd;
p->ps_unix[1] = 0x21; p->ps_unix[1] = 0x21;
@ -470,21 +470,26 @@ COUNT DosComLoader(BYTE FAR * namep, exec_blk * exp, COUNT mode, COUNT fd)
{ {
UWORD fcbcode; UWORD fcbcode;
psp FAR *p;
/* point to the PSP so we can build it */ /* point to the PSP so we can build it */
setvec(0x22, MK_FP(user_r->CS, user_r->IP)); setvec(0x22, MK_FP(user_r->CS, user_r->IP));
new_psp(mem, mem + asize); new_psp(mem, mem + asize);
fcbcode = patchPSP(mem - 1, env, exp, namep); fcbcode = patchPSP(mem - 1, env, exp, namep);
/* set asize to end of segment */ /* set asize to end of segment */
if (asize < 0x1000) if (asize > 0x1000)
asize = (asize << 4) - 2; asize = 0x1000;
else if (asize < 0x11)
asize = 0xfffe; return DE_NOMEM;
/* TODO: worry about PSP+6: asize -= 0x11;
CP/M compatibility--size of first segment for .COM files, /* CP/M compatibility--size of first segment for .COM files
while preserving the far call */ while preserving the far call to 0:00c0 +
copy in HMA at ffff:00d0 */
p = MK_FP(mem, 0);
p->ps_reentry = MK_FP(0xc - asize, asize << 4);
asize <<= 4;
asize += 0x10e;
exp->exec.stack = MK_FP(mem, asize); exp->exec.stack = MK_FP(mem, asize);
exp->exec.start_addr = MK_FP(mem, 0x100); exp->exec.start_addr = MK_FP(mem, 0x100);
*((UWORD FAR *) MK_FP(mem, asize)) = (UWORD) 0; *((UWORD FAR *) MK_FP(mem, asize)) = (UWORD) 0;