diff options
| author | Roberto Ierusalimschy <roberto@inf.puc-rio.br> | 2009-04-17 19:00:01 -0300 |
|---|---|---|
| committer | Roberto Ierusalimschy <roberto@inf.puc-rio.br> | 2009-04-17 19:00:01 -0300 |
| commit | d3037d97ec192e7719de485f15dacb473bf96528 (patch) | |
| tree | ea9f837cc64d9df82ae4324f2c7ea447b5c4582f /lstate.h | |
| parent | c6b442bd369ce05b3d4bfb95ba64451521aa1b31 (diff) | |
| download | lua-d3037d97ec192e7719de485f15dacb473bf96528.tar.gz lua-d3037d97ec192e7719de485f15dacb473bf96528.tar.bz2 lua-d3037d97ec192e7719de485f15dacb473bf96528.zip | |
several small improvements based on 'ci' being fixed now (including
erasing savedpc from lua_State)
Diffstat (limited to 'lstate.h')
| -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.41 2009/04/08 18:04:33 roberto Exp roberto $ | 2 | ** $Id: lstate.h,v 2.42 2009/04/17 14:28:06 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 | */ |
| @@ -81,11 +81,11 @@ typedef struct CallInfo { | |||
| 81 | StkId func; /* function index in the stack */ | 81 | StkId func; /* function index in the stack */ |
| 82 | StkId top; /* top for this function */ | 82 | StkId top; /* top for this function */ |
| 83 | struct CallInfo *previous, *next; /* dynamic call link */ | 83 | struct CallInfo *previous, *next; /* dynamic call link */ |
| 84 | const Instruction *savedpc; | ||
| 85 | short nresults; /* expected number of results from a call */ | 84 | short nresults; /* expected number of results from a call */ |
| 86 | lu_byte callstatus; | 85 | lu_byte callstatus; |
| 87 | union { | 86 | union { |
| 88 | struct { /* only for Lua functions */ | 87 | struct { /* only for Lua functions */ |
| 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; |
| 91 | struct { /* only for C functions */ | 91 | struct { /* only for C functions */ |
| @@ -165,7 +165,6 @@ struct lua_State { | |||
| 165 | global_State *l_G; | 165 | global_State *l_G; |
| 166 | CallInfo *ci; /* call info for current function */ | 166 | CallInfo *ci; /* call info for current function */ |
| 167 | int nci; /* number of total CallInfo structures linked */ | 167 | int nci; /* number of total CallInfo structures linked */ |
| 168 | const Instruction *savedpc; /* `savedpc' of current function */ | ||
| 169 | const Instruction *oldpc; /* last pc traced */ | 168 | const Instruction *oldpc; /* last pc traced */ |
| 170 | StkId stack_last; /* last free slot in the stack */ | 169 | StkId stack_last; /* last free slot in the stack */ |
| 171 | StkId stack; /* stack base */ | 170 | StkId stack; /* stack base */ |