github.com/Interlisp.maiko
1
0
Fork 0
mirror of https://github.com/Interlisp/maiko.git synced 2026-01-15 07:54:13 +00:00
Code Issues Projects Releases Wiki Activity

WARN() macro is used in functions with and without return values so must not return in the macro.

Browse Source 
Fix llstk.c uses of WARN() to return when necessary.

	modified:   inc/lispemul.h
	modified:   src/llstk.c
This commit is contained in:
Nick Briggs 2020-08-11 14:09:19 -07:00
parent b2a8d11d9c
commit 30bfeb3a43
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
inc/lispemul.h
View File

@ -498,7 +498,7 @@ extern int error(char *);
#define TIMER_EXIT(tos) {TopOfStack=tos; Error_Exit = 1; return(-2);}
#define WARN(message,operation) {warn(message);operation;return;}
#define WARN(message,operation) {warn(message);operation;}
#define NO_WOP {}
#define NIL 0 /* added 29-jan */

17
src/llstk.c
View File

@ -112,6 +112,7 @@ tryfsb:
#endif /* BIGVM */
if ((n <= StkOffset_from_68K(oldfx68k)) && (n >= oldfx68k->nextblock)) {
WARN("moveframe:check!!", sff(LADDR_from_68k(oldfx68k)));
return 0; /* ? */
}
}
#endif
@ -348,10 +349,12 @@ SCAN:
if (((Bframe *)scanptr68k)->residual) {
if (scanptr68k != orig68k) {
WARN("freestackblock:scanptr68k !=org", printf(":0x%x\n", LADDR_from_68k(scanptr68k)));
return 0; /* ? */
}
} else {
if (((Bframe *)scanptr68k)->ivar != StkOffset_from_68K(orig68k)) {
WARN("BF doesn't point TopIVAR", printf(":0x%x\n", LADDR_from_68k(scanptr68k)));
return 0; /* ? */
}
}
#endif
@ -531,6 +534,14 @@ void blt(register DLword *dest68k, register DLword *source68k, int nw) {
for DEBUG
*/
/**************************************************************/
#ifdef FSBCHECK
struct big_fsbs {
DLword offset;
DLword size;
} bigFSB[100];
int bigFSBindex = 0;
#endif
void stack_check(StackWord *start68k) {
StackWord *scanptr68k;
StackWord *endstack68k;
@ -541,12 +552,6 @@ void stack_check(StackWord *start68k) {
DLword freesize;
#ifdef FSBCHECK
struct big_fsbs {
DLword offset;
DLword size;
} bigFSB[100];
int bigFSBindex = 0;
memset((char *)bigFSB, 0, 100 * 2 * 2);
#endif