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

Changed and optimized call_nls a bit to return the id in the high word

Browse Source 
of a long, eliminating the on-stack pointer.


git-svn-id: https://svn.code.sf.net/p/freedos/svn/kernel/trunk@1313 6ac86273-5f31-0410-b378-82cca8765d1b
This commit is contained in:
Bart Oldeman 2007-05-15 17:41:35 +00:00
parent 85856ae35b
commit f2823f9f27
1 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
kernel/nls.c
View File

@ -91,17 +91,16 @@ struct nlsInfoBlock nlsInfo = {
***** MUX calling functions **************************************** ***** MUX calling functions ****************************************
********************************************************************/ ********************************************************************/
extern int ASMCFUNC call_nls(UWORD, struct nlsInfoBlock *, UWORD, UWORD, UWORD, extern long ASMPASCAL call_nls(UWORD, VOID FAR *, UWORD, UWORD, UWORD, UWORD);
UWORD, void FAR *, UWORD *);
/*== DS:SI _always_ points to global NLS info structure <-> no /*== DS:SI _always_ points to global NLS info structure <-> no
* subfct can use these registers for anything different. ==ska*/ * subfct can use these registers for anything different. ==ska*/
STATIC COUNT muxGo(int subfct, UWORD bp, UWORD cp, UWORD cntry, UWORD bufsize, STATIC long muxGo(int subfct, UWORD bp, UWORD cp, UWORD cntry, UWORD bufsize,
void FAR *buf, UWORD *id) void FAR *buf)
{ {
int ret; long ret;
log(("NLS: muxGo(): subfct=%x, cntry=%u, cp=%u, ES:DI=%p\n", log(("NLS: muxGo(): subfct=%x, cntry=%u, cp=%u, ES:DI=%p\n",
subfct, cntry, cp, buf)); subfct, cntry, cp, buf));
ret = call_nls(subfct, &nlsInfo, bp, cp, cntry, bufsize, buf, id); ret = call_nls(bp, buf, subfct, cp, cntry, bufsize);
log(("NLS: muxGo(): return value = %d\n", ret)); log(("NLS: muxGo(): return value = %d\n", ret));
return ret; return ret;
} }
@ -111,8 +110,7 @@ STATIC COUNT muxGo(int subfct, UWORD bp, UWORD cp, UWORD cntry, UWORD bufsize,
*/ */
COUNT muxLoadPkg(UWORD cp, UWORD cntry) COUNT muxLoadPkg(UWORD cp, UWORD cntry)
{ {
UWORD id; /* on stack, call_nls in int2f.asm takes care of this long ret;
* if DS != SS */
/* 0x1400 == not installed, ok to install */ /* 0x1400 == not installed, ok to install */
/* 0x1401 == not installed, not ok to install */ /* 0x1401 == not installed, not ok to install */
@ -122,16 +120,16 @@ COUNT muxLoadPkg(UWORD cp, UWORD cntry)
/* make sure the NLSFUNC ID is updated */ /* make sure the NLSFUNC ID is updated */
#error "NLS_FREEDOS_NLSFUNC_VERSION == NLS_FREEDOS_NLSFUNC_ID" #error "NLS_FREEDOS_NLSFUNC_VERSION == NLS_FREEDOS_NLSFUNC_ID"
#endif #endif
if (muxGo(0, 0, NLS_FREEDOS_NLSFUNC_VERSION, 0, NLS_FREEDOS_NLSFUNC_ID, 0, ret = muxGo(0, 0, NLS_FREEDOS_NLSFUNC_VERSION, 0, NLS_FREEDOS_NLSFUNC_ID, 0);
(UWORD *)&id) != 0x14ff) if ((int)ret != 0x14ff)
return DE_FILENOTFND; /* No NLSFUNC --> no load */ return DE_FILENOTFND; /* No NLSFUNC --> no load */
if (id != NLS_FREEDOS_NLSFUNC_ID) /* FreeDOS NLSFUNC will return */ if ((int)(ret >> 16) != NLS_FREEDOS_NLSFUNC_ID) /* FreeDOS NLSFUNC will return */
return DE_INVLDACC; /* This magic number */ return DE_INVLDACC; /* This magic number */
/* OK, the correct NLSFUNC is available --> load pkg */ /* OK, the correct NLSFUNC is available --> load pkg */
/* If cp == -1 on entry, NLSFUNC updates cp to the codepage loaded /* If cp == -1 on entry, NLSFUNC updates cp to the codepage loaded
into memory. The system must then change to this one later */ into memory. The system must then change to this one later */
return muxGo(NLSFUNC_LOAD_PKG, 0, cp, cntry, 0, 0, 0); return (int)muxGo(NLSFUNC_LOAD_PKG, 0, cp, cntry, 0, 0);
} }
STATIC int muxBufGo(int subfct, int bp, UWORD cp, UWORD cntry, STATIC int muxBufGo(int subfct, int bp, UWORD cp, UWORD cntry,
@ -140,7 +138,7 @@ STATIC int muxBufGo(int subfct, int bp, UWORD cp, UWORD cntry,
log(("NLS: muxBufGo(): subfct=%x, BP=%u, cp=%u, cntry=%u, len=%u, buf=%p\n", log(("NLS: muxBufGo(): subfct=%x, BP=%u, cp=%u, cntry=%u, len=%u, buf=%p\n",
subfct, bp, cp, cntry, bufsize, buf)); subfct, bp, cp, cntry, bufsize, buf));
return muxGo(subfct, bp, cp, cntry, bufsize, buf, 0); return (int)muxGo(subfct, bp, cp, cntry, bufsize, buf);
} }
#define mux65(s,cp,cc,bs,b) muxBufGo(2, (s), (cp), (cc), (bs), (b)) #define mux65(s,cp,cc,bs,b) muxBufGo(2, (s), (cp), (cc), (bs), (b))