diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2022-02-23 15:51:22 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2022-02-23 15:51:22 (GMT) |
| commit | 4730e6ee9451d9e82fa07ac1e12581e0e33c708a (patch) | |
| tree | 2bc828815e306c6800626330bfab28a0527ea482 /generic | |
| parent | 5480ada099bf8482a73fa4ed4fbc35a49039e2d2 (diff) | |
| parent | 9f8ca234489c677193efb409fef485ce4774e8c6 (diff) | |
| download | tcl-4730e6ee9451d9e82fa07ac1e12581e0e33c708a.zip tcl-4730e6ee9451d9e82fa07ac1e12581e0e33c708a.tar.gz tcl-4730e6ee9451d9e82fa07ac1e12581e0e33c708a.tar.bz2 | |
Merge 8.6
Diffstat (limited to 'generic')
| -rw-r--r-- | generic/tclBinary.c | 4 | ||||
| -rw-r--r-- | generic/tclExecute.c | 6 |
2 files changed, 6 insertions, 4 deletions
diff --git a/generic/tclBinary.c b/generic/tclBinary.c index 5ac08e9..4717b05 100644 --- a/generic/tclBinary.c +++ b/generic/tclBinary.c @@ -2383,12 +2383,12 @@ ScanNumber( value = (long) (buffer[0] + (buffer[1] << 8) + (buffer[2] << 16) - + (((long)buffer[3]) << 24)); + + (((unsigned long)buffer[3]) << 24)); } else { value = (long) (buffer[3] + (buffer[2] << 8) + (buffer[1] << 16) - + (((long) buffer[0]) << 24)); + + (((unsigned long) buffer[0]) << 24)); } /* diff --git a/generic/tclExecute.c b/generic/tclExecute.c index dfb195a..d6aa551 100644 --- a/generic/tclExecute.c +++ b/generic/tclExecute.c @@ -5904,7 +5904,8 @@ TEBCresume( (wResult * w2 != w1)) { wResult -= 1; } - wResult = w1 - w2*wResult; + wResult = (Tcl_WideInt)((Tcl_WideUInt)w1 - + (Tcl_WideUInt)w2*(Tcl_WideUInt)wResult); goto wideResultOfArithmetic; } break; @@ -8155,7 +8156,8 @@ ExecuteExtendedBinaryMathOp( && (wQuotient * w2 != w1)) { wQuotient -= 1; } - wRemainder = w1 - w2*wQuotient; + wRemainder = (Tcl_WideInt)((Tcl_WideUInt)w1 - + (Tcl_WideUInt)w2*(Tcl_WideUInt)wQuotient); WIDE_RESULT(wRemainder); } |