Miroirs/newrpl
1
0
Fork 0
mirror of https://git.code.sf.net/p/newrpl/sources synced 2024-11-16 19:51:25 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Modified how error handlers are called. Added RESUME command.

Browse source
This commit is contained in:
claudiol 2016-12-06 18:21:53 -05:00
parent 1c2264b0ea
commit e0e0f8fa3d
11 changed files with 78 additions and 79 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
mainwindow.cpp
View file

@ -661,3 +661,8 @@ void MainWindow::on_actionPower_ON_triggered()
screentmr->start(50);
}
void MainWindow::on_actionSimulate_Alarm_triggered()
{
}

2
mainwindow.h
View file

@ -56,6 +56,8 @@ private slots:
void on_actionPower_ON_triggered();
void on_actionSimulate_Alarm_triggered();
public slots:
void domaintimer();
private:

12
mainwindow.ui
View file

@ -54,8 +54,15 @@
<addaction name="separator"/>
<addaction name="actionEject_SD_Card_Image"/>
</widget>
<widget class="QMenu" name="menuHardware">
<property name="title">
<string>Hardware</string>
</property>
<addaction name="actionSimulate_Alarm"/>
</widget>
<addaction name="menuFile"/>
<addaction name="menuSD_Card"/>
<addaction name="menuHardware"/>
</widget>
<widget class="QToolBar" name="mainToolBar">
<attribute name="toolBarArea">
@ -106,6 +113,11 @@
<string>Power ON</string>
</property>
</action>
<action name="actionSimulate_Alarm">
<property name="text">
<string>Simulate Alarm</string>
</property>
</action>
</widget>
<layoutdefault spacing="6" margin="11"/>
<customwidgets>

26
newrpl/errors.c
View file

@ -70,29 +70,14 @@ void rplCatchException()
Exceptions=0; // RESET THE EXCEPTIONS TO ALLOW HANDLER TO RUN
if(ISPROLOG(*ErrorHandler) && (LIBNUM(*ErrorHandler)==DOCOL)) {
// SPECIAL LOW-LEVEL TRANSPARENT ERROR HANDLER
// DO NOT CLEANUP ANYTHING OR REMOVE THE HANDLER
// DO NOT CLEANUP ANYTHING OR REMOVE THE HANDLER
rplProtectData(); // PROTECT THE USER DATA STACK WITHIN THE ERROR HANDLER
rplPushRet(IPtr); // PUSH THE OFFENDING OPCODE TO RESUME AFTER THE ERROR HANDLER FINISHED
rplSetExceptionHandler((WORDPTR)error_reenter_seco);
// TRANSPARENT ERROR HANDLERS MUST ENSURE ALL STACK, RSTACK AND LOCALS ARE LEFT INTACT
rplPushRet(rplPeekRet(4)); // PUSH RETURN ADDRESS AS IF GOING INTO THE SECO
rplPushRet((WORDPTR)error_exit_seco); // INJECT CLEANUP UPON NORMAL RETURN
IPtr=rplPeekRet(2); /*=ErrorHandler (original)*/; // SKIP THE PROLOG OF THE SECO, SO THAT SEMI RETURNS DIRECTLY TO exiterror_seco
IPtr=rplPeekRet(4)-1; /*=ErrorHandler (original)*/;
CurOpcode=0;
} else {
// SET INSTRUCTION POINTER AND CONTINUE EXECUTION AT THE ERROR HANDLER
IPtr=ErrorHandler-1; // MAKE SURE THE FIRST OBJECT AT THE ERROR HANDLER IS NOT SKIPPED
CurOpcode=0;
rplRemoveExceptionHandler();
}
}
// RAISE AN RPL EXCEPTION
@ -102,6 +87,13 @@ void rplException(WORD exception)
ExceptionPointer=IPtr;
}
// RAISE A HARDWARE RPL EXCEPTION
void rplHardException(WORD exception)
{
HWExceptions|=exception;
}
// RAISE A LIBRARY ERROR EXCEPTION
// AND SET THE ERROR CODE TO THE GIVEN OPCODE
void rplError(WORD errorcode)

66
newrpl/lib-eight-docol.c
View file

@ -33,13 +33,14 @@
CMD(XEQSECO,MKTOKENINFO(7,TITYPE_NOTALLOWED,1,2)), \
ECMD(SEMI,";",MKTOKENINFO(1,TITYPE_NOTALLOWED,1,2)), \
CMD(EVAL1NEXT,MKTOKENINFO(9,TITYPE_NOTALLOWED,1,2)), \
ECMD(ERROR_EXIT,"",MKTOKENINFO(0,TITYPE_NOTALLOWED,1,2)), \
ECMD(ERROR_REENTER,"",MKTOKENINFO(0,TITYPE_NOTALLOWED,1,2)), \
CMD(RESUME,MKTOKENINFO(6,TITYPE_NOTALLOWED,1,2)), \
CMD(DOERR,MKTOKENINFO(5,TITYPE_NOTALLOWED,1,2)), \
CMD(ERRN,MKTOKENINFO(4,TITYPE_NOTALLOWED,1,2)), \
CMD(ERRM,MKTOKENINFO(4,TITYPE_NOTALLOWED,1,2)), \
CMD(ERR0,MKTOKENINFO(4,TITYPE_NOTALLOWED,1,2))
CMD(ERR0,MKTOKENINFO(4,TITYPE_NOTALLOWED,1,2)), \
CMD(HALT,MKTOKENINFO(4,TITYPE_NOTALLOWED,1,2))
@ -66,10 +67,6 @@ ROMOBJECT errormsg_ident[]={
TEXT2WORD('r','M','s','g')
};
ROMOBJECT error_exit_seco[]={
CMD_XEQSECO,
CMD_ERROR_EXIT
};
ROMOBJECT error_reenter_seco[]={
@ -82,7 +79,6 @@ ROMOBJECT error_reenter_seco[]={
// UP TO 64 OBJECTS ALLOWED, NO MORE
const WORDPTR const ROMPTR_TABLE[]={
(WORDPTR)errormsg_ident,
(WORDPTR)error_exit_seco,
(WORDPTR)error_reenter_seco,
0
};
@ -104,6 +100,10 @@ void LIB_HANDLER()
rplException(EX_EXITRPL);
return;
case BKPOINT:
// TODO: IMPLEMENT CONDITIONAL BREAKPOINTS
// FOR NOW BEHAVE SAME AS HALT
// DELIBERATE FALL-THROUGH
case HALT:
rplException(EX_HALT);
return;
case XEQSECO:
@ -135,37 +135,6 @@ void LIB_HANDLER()
// SINCE IPtr POINTS TO THE NEXT OBJECT, IT WILL BE SKIPPED
return;
case ERROR_EXIT:
// THIS IS CALLED ONLY WHEN INSIDE AN ERROR HANDLER TO CLEANUP AND EXIT
// JUST LIKE A NORMAL ERROR HANDLER WOULD
// THE RETURN STACK CAN NEVER BE EMPTY (CHECK THAT) AND IT SHOULD HAVE:
// ON NORMAL RETURN FROM AN ERROR HANDLER:
// 1: RETURN ADDRESS TO CONTINUE ERROR HANDLER
// 2: ... SAVED ERROR HANDLER ...
// 6: IPtr TO RESUME
// 7: ... 8: DATA STACK PROTECTION
// 9: ... SAVED USER ERROR HANDLER
{
if(rplDepthRet()<12) {
// THIS OPCODE WAS NOT CALLED FROM WITHIN AN ERROR HANDLER, JUST DO EXITRPL
rplException(EX_EXITRPL);
return;
}
if(ErrorHandler!=(WORDPTR)error_reenter_seco) {
// NOT WITHIN AN ERROR HANDLER
rplException(EX_EXITRPL);
return;
}
IPtr=rplPopRet(); // GET THE CALLER ADDRESS
if(IPtr) CurOpcode=*IPtr; // SET THE WORD SO MAIN LOOP SKIPS THIS OBJECT, AND THE NEXT ONE IS EXECUTED
rplRemoveExceptionHandler(); // REMOVE THE REENTRANT EXCEPTION HANDLER
rplPopRet(); // REMOVE RESUME ADDRESS
rplUnprotectData(); // REMOVE STACK PROTECTION
rplRemoveExceptionHandler(); // REMOVE ORIGINAL USER ERROR HANDLER
return; // AND CONTINUE EXECUTION AS IF SEMI WAS EXECUTED
}
case ERROR_REENTER:
// THIS IS CALLED ONLY WHEN A SPECIAL ERROR THROWS AN ERROR, TO CLEANUP AND EXIT
// JUST LIKE A NORMAL ERROR HANDLER WOULD
@ -181,6 +150,8 @@ void LIB_HANDLER()
return;
}
rplRemoveExceptionHandler(); // REMOVE SECOND RE-ENTER HANDLER
rplRemoveExceptionHandler(); // REMOVE ORIGINAL RE-ENTER ERROR HANDLER
rplPopRet(); // REMOVE RESUME ADDRESS
DSTop=rplUnprotectData(); // CLEANUP STACK FROM ANYTHING THE FAILING ERROR HANDLER DID
rplRemoveExceptionHandler(); // REMOVE ORIGINAL USER ERROR HANDLER
@ -196,25 +167,20 @@ void LIB_HANDLER()
// JUST LIKE A NORMAL ERROR HANDLER WOULD
// THE RETURN STACK CAN NEVER BE EMPTY (CHECK THAT) AND IT SHOULD HAVE:
// ON NORMAL RETURN FROM AN ERROR HANDLER:
// 1: exit_error_seco
// 2: RETURN ADDRESS TO CONTINUE ERROR HANDLER
// 3: ... SAVED ERROR HANDLER ...
// 7: IPtr TO RESUME
// 8: ... 9: DATA STACK PROTECTION
// 10: ... SAVED USER ERROR HANDLER
// 1: ... SAVED ERROR HANDLER ...
// 5: IPtr TO RESUME
// 6: ... 7: DATA STACK PROTECTION
// 8: ... SAVED USER ERROR HANDLER
{
if(rplDepthRet()<13) {
if(rplDepthRet()<11) {
// THIS OPCODE WAS NOT CALLED FROM WITHIN AN ERROR HANDLER, JUST DO NOP
return;
}
if((rplPeekRet(1)!=(WORDPTR)error_exit_seco) || (ErrorHandler!=(WORDPTR)error_reenter_seco)) {
if(ErrorHandler!=(WORDPTR)error_reenter_seco) {
// NOT WITHIN AN ERROR HANDLER, DO NOTHING
return;
}
rplPopRet(); // DON'T NEED exit_error_seco
rplPopRet(); // DROP THE CALLER ADDRESS TO EXIT THE ERROR HANDLER
rplRemoveExceptionHandler(); // REMOVE THE REENTRANT EXCEPTION HANDLER
IPtr=rplPopRet(); // RESUME AT THIS ADDRESS
CurOpcode=*IPtr; // MAKE SURE THE OFFENDING OBJECT IS SKIPPED
@ -365,8 +331,6 @@ void LIB_HANDLER()
return;
}
// ADD MORE OPCODES HERE
case OVR_EVAL:
case OVR_EVAL1:

31
newrpl/lib-nine-docol2.c
View file

@ -553,9 +553,20 @@ void LIB_HANDLER()
}
return;
case ELSEERR:
// THIS WOULD ONLY BE EXECUTED AT THE END OF AN ERROR TRAP. SKIP TO THE ENDERR MARKER
{
int count=0;
if(ErrorHandler!=(WORDPTR)error_reenter_seco) {
// NOT WITHIN AN ERROR HANDLER, DO NOTHING
return;
}
// AT THE END OF THE ERROR HANDLER, DO SOME CLEANUP
rplRemoveExceptionHandler();
rplPopRet();
rplUnprotectData();
rplRemoveExceptionHandler();
// SKIP TO THE ENDERR MARKER
int count=0;
while(count || (*IPtr!=MKOPCODE(LIBRARY_NUMBER,ENDERR)) ) {
if(*IPtr==MKOPCODE(LIBRARY_NUMBER,IFERR)) ++count;
if(*IPtr==MKOPCODE(LIBRARY_NUMBER,ENDERR)) --count;
@ -567,10 +578,20 @@ void LIB_HANDLER()
return;
case ENDERR:
// THIS IS ONLY EXECUTED WHEN EXITING AN ERROR HANDLER
// THERE'S NOTHING ELSE TO DO
return;
{
if(ErrorHandler!=(WORDPTR)error_reenter_seco) {
// NOT WITHIN AN ERROR HANDLER, OR AFTER AN ELSEERR STATEMENT, DO NOTHING
return;
}
// AT THE END OF THE ERROR HANDLER, DO SOME CLEANUP
rplRemoveExceptionHandler();
rplPopRet();
rplUnprotectData();
rplRemoveExceptionHandler();
return;
}
// STANDARIZED OPCODES:

1
newrpl/libraries.h
View file

@ -418,7 +418,6 @@ extern const WORD empty_string[];
extern const WORD empty_list[];
extern const WORD angle_180[];
extern const WORD savedcmdline_ident[];
extern const WORD error_exit_seco[];
extern const WORD error_reenter_seco[];

1
newrpl/newrpl.h
View file

@ -738,6 +738,7 @@ void rplSkipNextAlarm();
#define EX_ERRORCODE 8
#define EX_POWEROFF 16
#define EX_DIRTYFS 32
#define EX_AUTORESUME 64
// ADD OTHER EXCEPTIONS HERE

9
newrpl/runstream.c
View file

@ -257,7 +257,10 @@ BINT rplRun(void)
// INVALID OPCODE = END OF EXECUTION (CANNOT BE TRAPPED BY HANDLER)
return NEEDS_CLEANUP;
}
Exceptions|=HWExceptions; // COPY HARDWARE EXCEPTIONS INTO EXCEPTIONS AT THIS POINT TO AVOID
// STOPPING IN THE MIDDLE OF A COMMAND
if(Exceptions) {
if(HWExceptions) HWExceptions=0; // CLEAR ANY HARDWARE EXCEPTIONS
// HARD EXCEPTIONS FIRST, DO NOT ALLOW ERROR HANDLERS TO CATCH THESE ONES
if(Exceptions&EX_EXITRPL) {
@ -383,7 +386,7 @@ void rplInit(void)
DStkSize=0; // TOTAL SIZE OF DATA STACK
RStkSize=0; // TOTAL SIZE OF RETURN STACK
LAMSize=0;
Exceptions=0; // NO EXCEPTIONS RAISED
HWExceptions=Exceptions=0; // NO EXCEPTIONS RAISED
ExceptionPointer=0;
rplClearLibraries();
@ -473,7 +476,7 @@ void rplWarmInit(void)
IPtr=0; // INSTRUCTION POINTER SHOULD BE SET LATER TO A VALID RUNSTREAM
CurOpcode=0; // CURRENT OPCODE (WORD)
Exceptions=0; // NO EXCEPTIONS RAISED
HWExceptions=Exceptions=0; // NO EXCEPTIONS RAISED
ExceptionPointer=0;
RSTop=RStk; // CLEAR RETURN STACK
@ -562,7 +565,7 @@ void rplHotInit()
IPtr=0; // INSTRUCTION POINTER SHOULD BE SET LATER TO A VALID RUNSTREAM
CurOpcode=0; // CURRENT OPCODE (WORD)
Exceptions=0; // NO EXCEPTIONS RAISED
HWExceptions=Exceptions=0; // NO EXCEPTIONS RAISED
ExceptionPointer=0;
RSTop=RStk; // CLEAR RETURN STACK

2
newrpl/sysvars.c
View file

@ -79,7 +79,7 @@ BINT NumHiLibs;
// OTHER RPL CORE VARIABLES THAT ARE NOT AFFECTED BY GC
WORD CurOpcode; // CURRENT OPCODE (WORD)
WORD Exceptions, TrappedExceptions; // FLAGS FOR CURRENT EXCEPTIONS
WORD HWExceptions, Exceptions, TrappedExceptions; // FLAGS FOR CURRENT EXCEPTIONS
WORD ErrorCode, TrappedErrorCode;
WORDPTR *ValidateTop; // TEMPORARY DATA AFTER THE RETURN STACK USED DURING COMPILATION
WORDPTR *ValidateBottom; // TEMPORARY DATA AFTER THE RETURN STACK USED DURING COMPILATION

2
newrpl/sysvars.h
View file

@ -67,7 +67,7 @@ WORDPTR *LAMs; // BASE OF LOCAL VARIABLES STORAGE
// OTHER VARIABLES THAT ARE NOT AFFECTED BY GC
WORD CurOpcode; // CURRENT OPCODE (WORD)
WORD Exceptions, TrappedExceptions; // FLAGS FOR CURRENT EXCEPTIONS
WORD HWExceptions, Exceptions, TrappedExceptions; // FLAGS FOR CURRENT EXCEPTIONS
WORD ErrorCode, TrappedErrorCode;
WORDPTR *RSTop; // TOP OF THE RETURN STACK
WORDPTR *DSTop; // TOP OF THE DATA STACK