Tcl Source Code: Diff

Differences From Artifact [14ae0719ea]:

File generic/tclProc.c — part of check-in [d2cf6ff28a] at 2005-03-13 13:57:31 on branch msofer-wcodes-branch — * Changed files are the usual suspects. Each (instruction+operands) takes two words; instructions that take two operands pack them into a single pointer-sized int. Unused instructions removed from tclInstructionTable. (user: msofer size: 53962)

To Artifact [1e9b003bdb]:

File generic/tclProc.c — part of check-in [e6953ba3cf] at 2005-04-10 18:13:43 on branch msofer-wcodes-branch — * generic/tcl.h (comments): * generic/tclCmdIL.c: * generic/tclCompile.c: * generic/tclExecute.c: * generic/tclInt.h: * generic/tclNamesp.c: * generic/tclProc.c: * generic/tclVar.c: First part of variable reform. Change Var struct so that sizeof(Var)==sizeof(Tcl_Obj), and use the special obj allocator for vars. The Var struct has been reduced from (2ints+6ptrs) to (2ints+4ptrs). *** COMPAT: breaks both binary and (trivially) source compat for extensions that access the Var struct. * generic/tclCompile.c (optimiser): * generic/tclExecute.c: storing pointers to literals instead of offsets into the literal table for INST_PUSH. This is currently implemented using NASTY CASTS (ptr->TclPSizedInt->ptr) [not used when VM_USE_PACKED] *** REQUIRES CLEANING: use a union for opnd, instead of casting. (user: msofer size: 53722)

1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20	1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20	- +	/* * tclProc.c -- * * This file contains routines that implement Tcl procedures, * including the "proc" and "uplevel" commands. * * Copyright (c) 1987-1993 The Regents of the University of California. * Copyright (c) 1994-1998 Sun Microsystems, Inc. * * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * * RCS: @(#) $Id: tclProc.c,v 1.73.2.1 2005/0~~3/13~~ 13:5~~7:44~~ msofer Exp $ * RCS: @(#) $Id: tclProc.c,v 1.73.2.2 2005/04/10 18:13:51 msofer Exp $ / #include "tclInt.h" #include "tclCompile.h" / * Prototypes for static functions in this file
︙
981 982 983 984 985 986 987 ~~988~~ ~~989 990~~ 991 992 993 994 995 996 997	981 982 983 984 985 986 987 988 989 990 991 992 993 994 995	- + - -	* and we make the compiled local a link to the real variable. / if (haveResolvers) { Tcl_ResolvedVarInfo resVarInfo; for (; localPtr != NULL; varPtr++, localPtr = localPtr->nextPtr) { varPtr->value.objPtr = NULL; ~~varPtr->name = localPtr->name; /* will be just '\0' if temp var /~~ varPtr->id.name = localPtr->name; / will be just '\0' if temp var / ~~varPtr->nsPtr = NULL;~~ ~~varPtr->hPtr = NULL;~~ varPtr->refCount = 0; varPtr->tracePtr = NULL; varPtr->searchPtr = NULL; varPtr->flags = localPtr->flags; / * Now invoke the resolvers to determine the exact variables that
︙
1008 1009 1010 1011 1012 1013 1014 ~~1015~~ ~~1016 1017~~ 1018 1019 1020 1021 1022 1023 1024	1006 1007 1008 1009 1010 1011 1012 1013 1014 1015 1016 1017 1018 1019 1020	- + - -	varPtr->flags = VAR_LINK; } } } } else { for (; localPtr != NULL; varPtr++, localPtr = localPtr->nextPtr) { varPtr->value.objPtr = NULL; ~~varPtr->name = localPtr->name; /* will be just '\0' if temp var /~~ varPtr->id.name = localPtr->name; / will be just '\0' if temp var */ ~~varPtr->nsPtr = NULL;~~ ~~varPtr->hPtr = NULL;~~ varPtr->refCount = 0; varPtr->tracePtr = NULL; varPtr->searchPtr = NULL; varPtr->flags = localPtr->flags; } } }
︙
1177 1178 1179 1180 1181 1182 1183 ~~1184~~ ~~1185 1186~~ 1187 1188 1189 1190 1191 1192 1193 1194 1195 1196 1197 1198 1199 1200 1201 1202 ~~1203~~ ~~1204 1205~~ 1206 1207 1208 1209 1210 1211 1212	1173 1174 1175 1176 1177 1178 1179 1180 1181 1182 1183 1184 1185 1186 1187 1188 1189 1190 1191 1192 1193 1194 1195 1196 1197 1198 1199 1200 1201 1202 1203 1204	- + - - - + - -	/* * "Normal" arguments; last formal is special, depends on * it being 'args'. / Tcl_Obj objPtr = objv[i]; varPtr->value.objPtr = objPtr; Tcl_IncrRefCount(objPtr); /* local var is a reference / ~~varPtr->name = localPtr->name;~~ varPtr->id.name = localPtr->name; ~~varPtr->nsPtr = NULL;~~ ~~varPtr->hPtr = NULL;~~ varPtr->refCount = 0; varPtr->tracePtr = NULL; varPtr->searchPtr = NULL; varPtr->flags = localPtr->flags; varPtr++; localPtr = localPtr->nextPtr; } for (; i < numArgs; i++) { / * This loop is entered if argCt < (numArgs-1). * Set default values; last formal is special. / if (localPtr->defValuePtr != NULL) { Tcl_Obj objPtr = localPtr->defValuePtr; varPtr->value.objPtr = objPtr; Tcl_IncrRefCount(objPtr); /* local var is a reference */ ~~varPtr->name = localPtr->name;~~ varPtr->id.name = localPtr->name; ~~varPtr->nsPtr = NULL;~~ ~~varPtr->hPtr = NULL;~~ varPtr->refCount = 0; varPtr->tracePtr = NULL; varPtr->searchPtr = NULL; varPtr->flags = localPtr->flags; varPtr++; localPtr = localPtr->nextPtr; } else {
︙
1282 1283 1284 1285 1286 1287 1288 ~~1289~~ ~~1290 1291~~ 1292 1293 1294 1295 1296 1297 1298	1274 1275 1276 1277 1278 1279 1280 1281 1282 1283 1284 1285 1286 1287 1288	- + - -	TclDecrRefCount(desiredObjs[i]); } #endif /* AVOID_HACKS_FOR_ITCL / ckfree((char ) desiredObjs); goto procDone; } ~~varPtr->name = localPtr->name;~~ varPtr->id.name = localPtr->name; ~~varPtr->nsPtr = NULL;~~ ~~varPtr->hPtr = NULL;~~ varPtr->refCount = 0; varPtr->tracePtr = NULL; varPtr->searchPtr = NULL; varPtr->flags = localPtr->flags; localPtr = localPtr->nextPtr; varPtr++;
︙