diff options
| -rw-r--r-- | lstate.h | 10 |
1 files changed, 5 insertions, 5 deletions
| @@ -1,5 +1,5 @@ | |||
| 1 | /* | 1 | /* |
| 2 | ** $Id: lstate.h,v 2.22 2005/06/03 20:15:58 roberto Exp roberto $ | 2 | ** $Id: lstate.h,v 2.23 2005/07/09 13:22:34 roberto Exp roberto $ |
| 3 | ** Global State | 3 | ** Global State |
| 4 | ** See Copyright Notice in lua.h | 4 | ** See Copyright Notice in lua.h |
| 5 | */ | 5 | */ |
| @@ -49,8 +49,8 @@ typedef struct CallInfo { | |||
| 49 | StkId base; /* base for this function */ | 49 | StkId base; /* base for this function */ |
| 50 | StkId func; /* function index in the stack */ | 50 | StkId func; /* function index in the stack */ |
| 51 | StkId top; /* top for this function */ | 51 | StkId top; /* top for this function */ |
| 52 | int nresults; /* expected number of results from this function */ | ||
| 53 | const Instruction *savedpc; | 52 | const Instruction *savedpc; |
| 53 | int nresults; /* expected number of results from this function */ | ||
| 54 | int tailcalls; /* number of tail calls lost under this entry */ | 54 | int tailcalls; /* number of tail calls lost under this entry */ |
| 55 | } CallInfo; | 55 | } CallInfo; |
| 56 | 56 | ||
| @@ -71,9 +71,9 @@ typedef struct global_State { | |||
| 71 | void *ud; /* auxiliary data to `frealloc' */ | 71 | void *ud; /* auxiliary data to `frealloc' */ |
| 72 | lu_byte currentwhite; | 72 | lu_byte currentwhite; |
| 73 | lu_byte gcstate; /* state of garbage collector */ | 73 | lu_byte gcstate; /* state of garbage collector */ |
| 74 | int sweepstrgc; /* position of sweep in `strt' */ | ||
| 74 | GCObject *rootgc; /* list of all collectable objects */ | 75 | GCObject *rootgc; /* list of all collectable objects */ |
| 75 | GCObject **sweepgc; /* position of sweep in `rootgc' */ | 76 | GCObject **sweepgc; /* position of sweep in `rootgc' */ |
| 76 | int sweepstrgc; /* position of sweep in `strt' */ | ||
| 77 | GCObject *gray; /* list of gray objects */ | 77 | GCObject *gray; /* list of gray objects */ |
| 78 | GCObject *grayagain; /* list of objects to be traversed atomically */ | 78 | GCObject *grayagain; /* list of objects to be traversed atomically */ |
| 79 | GCObject *weak; /* list of weak tables (to be cleared) */ | 79 | GCObject *weak; /* list of weak tables (to be cleared) */ |
| @@ -99,6 +99,7 @@ typedef struct global_State { | |||
| 99 | */ | 99 | */ |
| 100 | struct lua_State { | 100 | struct lua_State { |
| 101 | CommonHeader; | 101 | CommonHeader; |
| 102 | lu_byte status; | ||
| 102 | StkId top; /* first free slot in the stack */ | 103 | StkId top; /* first free slot in the stack */ |
| 103 | StkId base; /* base of current function */ | 104 | StkId base; /* base of current function */ |
| 104 | global_State *l_G; | 105 | global_State *l_G; |
| @@ -106,14 +107,13 @@ struct lua_State { | |||
| 106 | const Instruction *savedpc; /* `savedpc' of current function */ | 107 | const Instruction *savedpc; /* `savedpc' of current function */ |
| 107 | StkId stack_last; /* last free slot in the stack */ | 108 | StkId stack_last; /* last free slot in the stack */ |
| 108 | StkId stack; /* stack base */ | 109 | StkId stack; /* stack base */ |
| 109 | int stacksize; | ||
| 110 | CallInfo *end_ci; /* points after end of ci array*/ | 110 | CallInfo *end_ci; /* points after end of ci array*/ |
| 111 | CallInfo *base_ci; /* array of CallInfo's */ | 111 | CallInfo *base_ci; /* array of CallInfo's */ |
| 112 | int stacksize; | ||
| 112 | int size_ci; /* size of array `base_ci' */ | 113 | int size_ci; /* size of array `base_ci' */ |
| 113 | unsigned short nCcalls; /* number of nested C calls */ | 114 | unsigned short nCcalls; /* number of nested C calls */ |
| 114 | lu_byte hookmask; | 115 | lu_byte hookmask; |
| 115 | lu_byte allowhook; | 116 | lu_byte allowhook; |
| 116 | lu_byte status; | ||
| 117 | int basehookcount; | 117 | int basehookcount; |
| 118 | int hookcount; | 118 | int hookcount; |
| 119 | lua_Hook hook; | 119 | lua_Hook hook; |
