summaryrefslogtreecommitdiffstats
path: root/generic
diff options
context:
space:
mode:
authorhobbs <hobbs>2000-09-06 16:59:27 (GMT)
committerhobbs <hobbs>2000-09-06 16:59:27 (GMT)
commitf27975a82da0d3457defda9dc6f274fdda29df98 (patch)
treef6ac1250edf8e06eafe42b81ff5b56d83e9dd047 /generic
parenteb0d24b6b2b52496a9d8ca60271bdf86ec4692df (diff)
downloadtcl-f27975a82da0d3457defda9dc6f274fdda29df98.zip
tcl-f27975a82da0d3457defda9dc6f274fdda29df98.tar.gz
tcl-f27975a82da0d3457defda9dc6f274fdda29df98.tar.bz2
* generic/tclExecute.c (TclExecuteByteCode): INST_STR_INDEX fixed
pedantic cast warning. Corrected support for building with -DTCL_COMPILE_STATS. Added efficiency check of object equality.
Diffstat (limited to 'generic')
-rw-r--r--generic/tclExecute.c45
1 files changed, 32 insertions, 13 deletions
diff --git a/generic/tclExecute.c b/generic/tclExecute.c
index 782ea7d..e9e3ebb 100644
--- a/generic/tclExecute.c
+++ b/generic/tclExecute.c
@@ -10,7 +10,7 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tclExecute.c,v 1.14 2000/06/06 19:34:52 hobbs Exp $
+ * RCS: @(#) $Id: tclExecute.c,v 1.15 2000/09/06 16:59:27 hobbs Exp $
*/
#include "tclInt.h"
@@ -115,6 +115,17 @@ static char *resultStrings[] = {
#endif
/*
+ * These are used by evalstats to monitor object usage in Tcl.
+ */
+
+#ifdef TCL_COMPILE_STATS
+long tclObjsAlloced = 0;
+long tclObjsFreed = 0;
+#define TCL_MAX_SHARED_OBJ_STATS 5
+long tclObjsShared[TCL_MAX_SHARED_OBJ_STATS] = { 0, 0, 0, 0, 0 };
+#endif /* TCL_COMPILE_STATS */
+
+/*
* Macros for testing floating-point values for certain special cases. Test
* for not-a-number by comparing a value against itself; test for infinity
* by comparing against the largest floating-point value.
@@ -1769,21 +1780,29 @@ TclExecuteByteCode(interp, codePtr)
value2Ptr = POP_OBJECT();
valuePtr = POP_OBJECT();
- s1 = Tcl_GetStringFromObj(valuePtr, &s1len);
- s2 = Tcl_GetStringFromObj(value2Ptr, &s2len);
- if (s1len == s2len) {
+ if (valuePtr == value2Ptr) {
/*
- * We only need to check (in)equality when we have equal
- * length strings.
+ * On the off-chance that the objects are the same,
+ * we don't really have to think hard about equality.
*/
- if (*pc == INST_STR_NEQ) {
- iResult = (strcmp(s1, s2) != 0);
+ iResult = (*pc == INST_STR_EQ);
+ } else {
+ s1 = Tcl_GetStringFromObj(valuePtr, &s1len);
+ s2 = Tcl_GetStringFromObj(value2Ptr, &s2len);
+ if (s1len == s2len) {
+ /*
+ * We only need to check (in)equality when
+ * we have equal length strings.
+ */
+ if (*pc == INST_STR_NEQ) {
+ iResult = (strcmp(s1, s2) != 0);
+ } else {
+ /* INST_STR_EQ */
+ iResult = (strcmp(s1, s2) == 0);
+ }
} else {
- /* INST_STR_EQ */
- iResult = (strcmp(s1, s2) == 0);
+ iResult = (*pc == INST_STR_NEQ);
}
- } else {
- iResult = (*pc == INST_STR_NEQ);
}
PUSH_OBJECT(Tcl_NewIntObj(iResult));
@@ -1864,7 +1883,7 @@ TclExecuteByteCode(interp, codePtr)
*/
if (valuePtr->typePtr == &tclByteArrayType) {
- bytes = Tcl_GetByteArrayFromObj(valuePtr, &length);
+ bytes = (char *)Tcl_GetByteArrayFromObj(valuePtr, &length);
} else {
/*
* Get Unicode char length to calulate what 'end' means.