github.com/Interlisp.maiko
1
0
Fork 0
mirror of https://github.com/Interlisp/maiko.git synced 2026-01-29 04:51:28 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #158 from Interlisp/unwind-int-unsigned-ptr-confusion

Browse Source 
Correct handling of return value of N_OP_unwind()
This commit is contained in:
Larry Masinter
2021-01-01 14:29:44 -08:00
committed by GitHub
parent fc3908f19a 12c5f3231e
commit 67d6a799db
3 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/unwind.c
View File

@@ -28,7 +28,7 @@
#include "unwinddefs.h"
UNSIGNED N_OP_unwind(register LispPTR *cstkptr, register LispPTR tos, int n, int keep) {
LispPTR *N_OP_unwind(register LispPTR *cstkptr, register LispPTR tos, int n, int keep) {
register int num; /* number of UNBOUND slot */
register LispPTR *endptr; /* unwind limit */
register LispPTR *lastpvar; /* points PVar slot that is unbounded. */
@@ -64,7 +64,10 @@ UNSIGNED N_OP_unwind(register LispPTR *cstkptr, register LispPTR tos, int n, int
if (endptr > cstkptr) {
CurrentStackPTR = (DLword *)cstkptr;
ERROR_EXIT(tos);
/* this would be ERROR_EXIT(tos); but for having to return a pointer */
TopOfStack = tos;
Error_Exit = 1;
return (LispPTR *)(-1);
}
*cstkptr++ = tos;
@@ -85,7 +88,7 @@ UNSIGNED N_OP_unwind(register LispPTR *cstkptr, register LispPTR tos, int n, int
/* endptr = cstkptr */
if (keep) { *(cstkptr++) = tos; }
return ((UNSIGNED)cstkptr);
return (cstkptr);
} /* N_OP_unwind */