Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | fix incomplete merge |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | mig-no280 |
| Files: | files | file ages | folders |
| SHA1: |
7f00e4f36dff0893f4214cf99097f829 |
| User & Date: | mig 2011-04-07 03:03:00 |
Context
|
2011-04-11
| ||
| 11:09 | merge trunk check-in: b936648e57 user: mig tags: mig-no280 | |
|
2011-04-07
| ||
| 03:03 | fix incomplete merge check-in: 7f00e4f36d user: mig tags: mig-no280 | |
| 02:57 | merge trunk to feature branch check-in: fec12a456e user: mig tags: mig-no280 | |
| 00:11 | last bugfix was incomplete check-in: df052ad59f user: mig tags: trunk | |
|
2011-04-06
| ||
| 23:35 | * generic/tclExecute.c: fix for [Bug 3274728], making *catchTop an unsigned long. check-in: caf317ab68 user: mig tags: trunk | |
Changes
Changes to ChangeLog.
1 2 3 4 5 6 7 | 2011-04-06 Jan Nijtmans <[email protected]> * unix/tclAppInit.c: Make symbols "main" and "Tcl_AppInit" MODULE_SCOPE: there is absolutely no reason for exporting them. * unix/tcl.m4: Don't use -fvisibility=hidden with static * unix/configure libraries (--disable-shared) | > > > > > | 1 2 3 4 5 6 7 8 9 10 11 12 | 2011-04-06 Miguel Sofer <[email protected]> * generic/tclExecute.c: fix for [Bug 3274728], making *catchTop an unsigned long. 2011-04-06 Jan Nijtmans <[email protected]> * unix/tclAppInit.c: Make symbols "main" and "Tcl_AppInit" MODULE_SCOPE: there is absolutely no reason for exporting them. * unix/tcl.m4: Don't use -fvisibility=hidden with static * unix/configure libraries (--disable-shared) |
| ︙ | ︙ |
Changes to generic/tclExecute.c.
| ︙ | ︙ | |||
168 169 170 171 172 173 174 |
* Minimal data required to fully reconstruct the execution state.
*/
typedef struct TEBCdata {
ByteCode *codePtr; /* Constant until the BC returns */
/* -----------------------------------------*/
const unsigned char *pc; /* These fields are used on return TO this */
| | | 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 |
* Minimal data required to fully reconstruct the execution state.
*/
typedef struct TEBCdata {
ByteCode *codePtr; /* Constant until the BC returns */
/* -----------------------------------------*/
const unsigned char *pc; /* These fields are used on return TO this */
unsigned long *catchTop; /* this level: they record the state when a */
int cleanup; /* new codePtr was received for NR */
Tcl_Obj *auxObjList; /* execution. */
int checkInterp;
void * stack[1]; /* Start of the actual combined catch and obj
* stacks; the struct will be expanded as
* necessary */
} TEBCdata;
|
| ︙ | ︙ | |||
330 331 332 333 334 335 336 | #define OBJ_AT_TOS *tosPtr #define OBJ_UNDER_TOS *(tosPtr-1) #define OBJ_AT_DEPTH(n) *(tosPtr-(n)) | | | 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 | #define OBJ_AT_TOS *tosPtr #define OBJ_UNDER_TOS *(tosPtr-1) #define OBJ_AT_DEPTH(n) *(tosPtr-(n)) #define CURR_DEPTH ((unsigned long) (tosPtr - initTosPtr)) /* * Macros used to trace instruction execution. The macros TRACE, * TRACE_WITH_OBJ, and O2S are only used inside TclNRExecuteByteCode. O2S is * only used in TRACE* calls to get a string from an object. */ |
| ︙ | ︙ | |||
1836 1837 1838 1839 1840 1841 1842 | * contains the result of executing the code or an error message. * * Side effects: * Almost certainly, depending on the ByteCode's instructions. * *---------------------------------------------------------------------- */ | | | 1836 1837 1838 1839 1840 1841 1842 1843 1844 1845 1846 1847 1848 1849 1850 |
* contains the result of executing the code or an error message.
*
* Side effects:
* Almost certainly, depending on the ByteCode's instructions.
*
*----------------------------------------------------------------------
*/
#define initCatchTop ((unsigned long *) (&TD->stack[-1]))
#define initTosPtr ((Tcl_Obj **) (initCatchTop+codePtr->maxExceptDepth))
#define esPtr (iPtr->execEnvPtr->execStackPtr)
int
TclNRExecuteByteCode(
Tcl_Interp *interp, /* Token for command interpreter. */
ByteCode *codePtr) /* The bytecode sequence to interpret. */
|
| ︙ | ︙ |