diff options
| author | Roberto Ierusalimschy <roberto@inf.puc-rio.br> | 2009-06-01 16:09:26 -0300 |
|---|---|---|
| committer | Roberto Ierusalimschy <roberto@inf.puc-rio.br> | 2009-06-01 16:09:26 -0300 |
| commit | 9423e22aa35f47b392fc52a1b93c1be4c69f2aee (patch) | |
| tree | 4d466663bc69a342941ea9830b17014aa76acfb2 /lstate.h | |
| parent | 57f8414de1968b6f9f212140f2da14cba3b6dacb (diff) | |
| download | lua-9423e22aa35f47b392fc52a1b93c1be4c69f2aee.tar.gz lua-9423e22aa35f47b392fc52a1b93c1be4c69f2aee.tar.bz2 lua-9423e22aa35f47b392fc52a1b93c1be4c69f2aee.zip | |
no more L->base + ci->base only for Lua functions (C functions may use
'func')
Diffstat (limited to '')
| -rw-r--r-- | lstate.h | 5 |
1 files changed, 2 insertions, 3 deletions
| @@ -1,5 +1,5 @@ | |||
| 1 | /* | 1 | /* |
| 2 | ** $Id: lstate.h,v 2.42 2009/04/17 14:28:06 roberto Exp roberto $ | 2 | ** $Id: lstate.h,v 2.43 2009/04/17 22:00:01 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 | */ |
| @@ -77,7 +77,6 @@ typedef struct stringtable { | |||
| 77 | ** informations about a call | 77 | ** informations about a call |
| 78 | */ | 78 | */ |
| 79 | typedef struct CallInfo { | 79 | typedef struct CallInfo { |
| 80 | StkId base; /* base for this function */ | ||
| 81 | StkId func; /* function index in the stack */ | 80 | StkId func; /* function index in the stack */ |
| 82 | StkId top; /* top for this function */ | 81 | StkId top; /* top for this function */ |
| 83 | struct CallInfo *previous, *next; /* dynamic call link */ | 82 | struct CallInfo *previous, *next; /* dynamic call link */ |
| @@ -85,6 +84,7 @@ typedef struct CallInfo { | |||
| 85 | lu_byte callstatus; | 84 | lu_byte callstatus; |
| 86 | union { | 85 | union { |
| 87 | struct { /* only for Lua functions */ | 86 | struct { /* only for Lua functions */ |
| 87 | StkId base; /* base for this function */ | ||
| 88 | const Instruction *savedpc; | 88 | const Instruction *savedpc; |
| 89 | int tailcalls; /* number of tail calls lost under this entry */ | 89 | int tailcalls; /* number of tail calls lost under this entry */ |
| 90 | } l; | 90 | } l; |
| @@ -161,7 +161,6 @@ struct lua_State { | |||
| 161 | CommonHeader; | 161 | CommonHeader; |
| 162 | lu_byte status; | 162 | lu_byte status; |
| 163 | StkId top; /* first free slot in the stack */ | 163 | StkId top; /* first free slot in the stack */ |
| 164 | StkId base; /* base of current function */ | ||
| 165 | global_State *l_G; | 164 | global_State *l_G; |
| 166 | CallInfo *ci; /* call info for current function */ | 165 | CallInfo *ci; /* call info for current function */ |
| 167 | int nci; /* number of total CallInfo structures linked */ | 166 | int nci; /* number of total CallInfo structures linked */ |
