Skip to content

kernel: refactor interpreter state handling #3823

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ChrisJefferson merged 2 commits into from
Jan 10, 2020
Merged

kernel: refactor interpreter state handling #3823

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
eec98fe
kernel: move interpreter state from GAPState to stack
fingolfin Jan 9, 2020
8211b18
kernel: clang-format previous commit
fingolfin Jan 9, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions src/gapstate.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,6 @@ typedef struct GAPState {
#endif

/* From intrprtr.c */
UInt IntrIgnoring;
UInt IntrReturning;
UInt IntrCoding;
Obj IntrState;
Obj StackObj;
Copy link
Member Author

@fingolfin fingolfin Jan 9, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These variables are removed from the global GAPState and put into a stack allocated IntrState.

WEll, all except STATE(IntrState) which itself became superfluous.

Obj Tilde;

// The current assertion level for use in Assert
Expand Down
9 changes: 5 additions & 4 deletions src/hpc/threadapi.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -432,14 +432,15 @@ static GVarDescriptor GVarTHREAD_EXIT;

static void ThreadedInterpreter(void * funcargs)
{
IntrState intr = { 0, 0, 0, 0 };
Copy link
Member Author

@fingolfin fingolfin Jan 9, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Allocate IntrState on the stack and use it below.

Obj tmp, func;
int i;

/* initialize everything and begin an interpreter */
STATE(NrError) = 0;
STATE(ThrownObject) = 0;

IntrBegin(STATE(BottomLVars));
IntrBegin(&intr, STATE(BottomLVars));
tmp = KEPTALIVE(funcargs);
StopKeepAlive(funcargs);
func = ELM_PLIST(tmp, 1);
Expand All @@ -461,13 +462,13 @@ static void ThreadedInterpreter(void * funcargs)
exit = GVarOptFunction(&GVarTHREAD_EXIT);
if (exit)
CALL_0ARGS(exit);
PushVoidObj();
PushVoidObj(&intr);
/* end the interpreter */
IntrEnd(0, NULL);
IntrEnd(&intr, 0, NULL);
}
CATCH_ERROR
{
IntrEnd(1, NULL);
IntrEnd(&intr, 1, NULL);
ClearError();
}
}
Expand Down
Loading