Vm-dev March 2016

vm-dev@lists.squeakfoundation.org

33 participants
139 discussions

[commit][3660] Fix a bug in sqAtomicOps. h where the assumption that the intrinsic atomic add
by commits＠squeakvm.org 28 Mar '16

28 Mar '16

Revision: 3660 Author: eliot Date: 2016-03-28 14:36:20 -0700 (Mon, 28 Mar 2016) Log Message: ----------- Fix a bug in sqAtomicOps.h where the assumption that the intrinsic atomic add operation will apply to 16-bit variables is false on clang. So on x86 and x64 use inline assembly with gcc and clang since this is known to work. Improve the doSignalSemaphores code in sqExternalSemaphores.c so that the tide variables are initialized at the right point and so there's only one copy of the signalling code. Change the order of a debug printf in sqUnixSocket.c so that debug logging is more comprehensible. Update all the mac & win mvm scripts to allow e.g. ./mvm -- -f Makefile.foo Modified Paths: -------------- branches/Cog/build.macos32x86/glue.cog.spur/mvm branches/Cog/build.macos32x86/glue.stack.spur/mvm branches/Cog/build.macos32x86/newspeak.cog.spur/mvm branches/Cog/build.macos32x86/newspeak.stack.spur/mvm branches/Cog/build.macos32x86/pharo.cog.spur/mvm branches/Cog/build.macos32x86/squeak+immutability.cog.spur/mvm branches/Cog/build.macos32x86/squeak.cog.spur/mvm branches/Cog/build.macos32x86/squeak.cog.spur.immutability/mvm branches/Cog/build.macos32x86/squeak.cog.v3/mvm branches/Cog/build.macos32x86/squeak.sista.spur/mvm branches/Cog/build.macos32x86/squeak.stack.spur/mvm branches/Cog/build.macos32x86/squeak.stack.v3/mvm branches/Cog/build.macos64x64/newspeak.cog.spur/mvm branches/Cog/build.macos64x64/newspeak.stack.spur/mvm branches/Cog/build.macos64x64/pharo.cog.spur/mvm branches/Cog/build.macos64x64/squeak.cog.spur/mvm branches/Cog/build.macos64x64/squeak.cog.spur.immutability/mvm branches/Cog/build.macos64x64/squeak.sista.spur/mvm branches/Cog/build.macos64x64/squeak.stack.spur/mvm branches/Cog/build.win32x86/newspeak.cog.spur/mvm branches/Cog/build.win32x86/newspeak.stack.spur/mvm branches/Cog/build.win32x86/squeak.cog.spur/mvm branches/Cog/build.win32x86/squeak.cog.v3/mvm branches/Cog/build.win32x86/squeak.stack.spur/mvm branches/Cog/build.win32x86/squeak.stack.v3/mvm branches/Cog/platforms/Cross/vm/sqAtomicOps.h branches/Cog/platforms/Cross/vm/sqExternalSemaphores.c branches/Cog/platforms/unix/plugins/SocketPlugin/sqUnixSocket.c branches/Cog/spursrc/vm/gcc3x-cointerp.c Property Changed: ---------------- branches/Cog/platforms/Cross/vm/sqSCCSVersion.h Modified: branches/Cog/build.macos32x86/glue.cog.spur/mvm =================================================================== --- branches/Cog/build.macos32x86/glue.cog.spur/mvm 2016-03-28 21:23:28 UTC (rev 3659) +++ branches/Cog/build.macos32x86/glue.cog.spur/mvm 2016-03-28 21:36:20 UTC (rev 3660) @@ -12,13 +12,19 @@ *) echo usage $0 [-A] [-a\ [-d] [-f]; exit 0;; esac done + if [ "$1" = -- ]; then + if [ "$A$D$F" = "" ]; then + A=1;D=1;F=1 + fi + fi + shift `expr $OPTIND - 1` fi if [ -n "$D" ]; then - make debug 2>&1 | tee LOGD + make $@ debug 2>&1 | tee LOGD fi if [ -n "$A" ]; then - make assert 2>&1 | tee LOGA + make $@ assert 2>&1 | tee LOGA fi if [ -n "$F" ]; then - make 2>&1 | tee LOGF + make $@ 2>&1 | tee LOGF fi Modified: branches/Cog/build.macos32x86/glue.stack.spur/mvm =================================================================== --- branches/Cog/build.macos32x86/glue.stack.spur/mvm 2016-03-28 21:23:28 UTC (rev 3659) +++ branches/Cog/build.macos32x86/glue.stack.spur/mvm 2016-03-28 21:36:20 UTC (rev 3660) @@ -12,13 +12,19 @@ *) echo usage $0 [-A] [-a\ [-d] [-f]; exit 0;; esac done + if [ "$1" = -- ]; then + if [ "$A$D$F" = "" ]; then + A=1;D=1;F=1 + fi + fi + shift `expr $OPTIND - 1` fi if [ -n "$D" ]; then - make debug 2>&1 | tee LOGD + make $@ debug 2>&1 | tee LOGD fi if [ -n "$A" ]; then - make assert 2>&1 | tee LOGA + make $@ assert 2>&1 | tee LOGA fi if [ -n "$F" ]; then - make 2>&1 | tee LOGF + make $@ 2>&1 | tee LOGF fi Modified: branches/Cog/build.macos32x86/newspeak.cog.spur/mvm =================================================================== --- branches/Cog/build.macos32x86/newspeak.cog.spur/mvm 2016-03-28 21:23:28 UTC (rev 3659) +++ branches/Cog/build.macos32x86/newspeak.cog.spur/mvm 2016-03-28 21:36:20 UTC (rev 3660) @@ -12,13 +12,19 @@ *) echo usage $0 [-A] [-a\ [-d] [-f]; exit 0;; esac done + if [ "$1" = -- ]; then + if [ "$A$D$F" = "" ]; then + A=1;D=1;F=1 + fi + fi + shift `expr $OPTIND - 1` fi if [ -n "$D" ]; then - make debug 2>&1 | tee LOGD + make $@ debug 2>&1 | tee LOGD fi if [ -n "$A" ]; then - make assert 2>&1 | tee LOGA + make $@ assert 2>&1 | tee LOGA fi if [ -n "$F" ]; then - make 2>&1 | tee LOGF + make $@ 2>&1 | tee LOGF fi Modified: branches/Cog/build.macos32x86/newspeak.stack.spur/mvm =================================================================== --- branches/Cog/build.macos32x86/newspeak.stack.spur/mvm 2016-03-28 21:23:28 UTC (rev 3659) +++ branches/Cog/build.macos32x86/newspeak.stack.spur/mvm 2016-03-28 21:36:20 UTC (rev 3660) @@ -12,13 +12,19 @@ *) echo usage $0 [-A] [-a\ [-d] [-f]; exit 0;; esac done + if [ "$1" = -- ]; then + if [ "$A$D$F" = "" ]; then + A=1;D=1;F=1 + fi + fi + shift `expr $OPTIND - 1` fi if [ -n "$D" ]; then - make debug 2>&1 | tee LOGD + make $@ debug 2>&1 | tee LOGD fi if [ -n "$A" ]; then - make assert 2>&1 | tee LOGA + make $@ assert 2>&1 | tee LOGA fi if [ -n "$F" ]; then - make 2>&1 | tee LOGF + make $@ 2>&1 | tee LOGF fi Modified: branches/Cog/build.macos32x86/pharo.cog.spur/mvm =================================================================== --- branches/Cog/build.macos32x86/pharo.cog.spur/mvm 2016-03-28 21:23:28 UTC (rev 3659) +++ branches/Cog/build.macos32x86/pharo.cog.spur/mvm 2016-03-28 21:36:20 UTC (rev 3660) @@ -12,13 +12,19 @@ *) echo usage $0 [-A] [-a\ [-d] [-f]; exit 0;; esac done + if [ "$1" = -- ]; then + if [ "$A$D$F" = "" ]; then + A=1;D=1;F=1 + fi + fi + shift `expr $OPTIND - 1` fi if [ -n "$D" ]; then - make debug 2>&1 | tee LOGD + make $@ debug 2>&1 | tee LOGD fi if [ -n "$A" ]; then - make assert 2>&1 | tee LOGA + make $@ assert 2>&1 | tee LOGA fi if [ -n "$F" ]; then - make 2>&1 | tee LOGF + make $@ 2>&1 | tee LOGF fi Modified: branches/Cog/build.macos32x86/squeak+immutability.cog.spur/mvm =================================================================== --- branches/Cog/build.macos32x86/squeak+immutability.cog.spur/mvm 2016-03-28 21:23:28 UTC (rev 3659) +++ branches/Cog/build.macos32x86/squeak+immutability.cog.spur/mvm 2016-03-28 21:36:20 UTC (rev 3660) @@ -12,13 +12,19 @@ *) echo usage $0 [-A] [-a\ [-d] [-f]; exit 0;; esac done + if [ "$1" = -- ]; then + if [ "$A$D$F" = "" ]; then + A=1;D=1;F=1 + fi + fi + shift `expr $OPTIND - 1` fi if [ -n "$D" ]; then - make debug 2>&1 | tee LOGD + make $@ debug 2>&1 | tee LOGD fi if [ -n "$A" ]; then - make assert 2>&1 | tee LOGA + make $@ assert 2>&1 | tee LOGA fi if [ -n "$F" ]; then - make 2>&1 | tee LOGF + make $@ 2>&1 | tee LOGF fi Modified: branches/Cog/build.macos32x86/squeak.cog.spur/mvm =================================================================== --- branches/Cog/build.macos32x86/squeak.cog.spur/mvm 2016-03-28 21:23:28 UTC (rev 3659) +++ branches/Cog/build.macos32x86/squeak.cog.spur/mvm 2016-03-28 21:36:20 UTC (rev 3660) @@ -12,13 +12,19 @@ *) echo usage $0 [-A] [-a\ [-d] [-f]; exit 0;; esac done + if [ "$1" = -- ]; then + if [ "$A$D$F" = "" ]; then + A=1;D=1;F=1 + fi + fi + shift `expr $OPTIND - 1` fi if [ -n "$D" ]; then - make debug 2>&1 | tee LOGD + make $@ debug 2>&1 | tee LOGD fi if [ -n "$A" ]; then - make assert 2>&1 | tee LOGA + make $@ assert 2>&1 | tee LOGA fi if [ -n "$F" ]; then - make 2>&1 | tee LOGF + make $@ 2>&1 | tee LOGF fi Modified: branches/Cog/build.macos32x86/squeak.cog.spur.immutability/mvm =================================================================== --- branches/Cog/build.macos32x86/squeak.cog.spur.immutability/mvm 2016-03-28 21:23:28 UTC (rev 3659) +++ branches/Cog/build.macos32x86/squeak.cog.spur.immutability/mvm 2016-03-28 21:36:20 UTC (rev 3660) @@ -12,13 +12,19 @@ *) echo usage $0 [-A] [-a\ [-d] [-f]; exit 0;; esac done + if [ "$1" = -- ]; then + if [ "$A$D$F" = "" ]; then + A=1;D=1;F=1 + fi + fi + shift `expr $OPTIND - 1` fi if [ -n "$D" ]; then - make debug 2>&1 | tee LOGD + make $@ debug 2>&1 | tee LOGD fi if [ -n "$A" ]; then - make assert 2>&1 | tee LOGA + make $@ assert 2>&1 | tee LOGA fi if [ -n "$F" ]; then - make 2>&1 | tee LOGF + make $@ 2>&1 | tee LOGF fi Modified: branches/Cog/build.macos32x86/squeak.cog.v3/mvm =================================================================== --- branches/Cog/build.macos32x86/squeak.cog.v3/mvm 2016-03-28 21:23:28 UTC (rev 3659) +++ branches/Cog/build.macos32x86/squeak.cog.v3/mvm 2016-03-28 21:36:20 UTC (rev 3660) @@ -12,13 +12,19 @@ *) echo usage $0 [-A] [-a\ [-d] [-f]; exit 0;; esac done + if [ "$1" = -- ]; then + if [ "$A$D$F" = "" ]; then + A=1;D=1;F=1 + fi + fi + shift `expr $OPTIND - 1` fi if [ -n "$D" ]; then - make debug 2>&1 | tee LOGD + make $@ debug 2>&1 | tee LOGD fi if [ -n "$A" ]; then - make assert 2>&1 | tee LOGA + make $@ assert 2>&1 | tee LOGA fi if [ -n "$F" ]; then - make 2>&1 | tee LOGF + make $@ 2>&1 | tee LOGF fi Modified: branches/Cog/build.macos32x86/squeak.sista.spur/mvm =================================================================== --- branches/Cog/build.macos32x86/squeak.sista.spur/mvm 2016-03-28 21:23:28 UTC (rev 3659) +++ branches/Cog/build.macos32x86/squeak.sista.spur/mvm 2016-03-28 21:36:20 UTC (rev 3660) @@ -12,13 +12,19 @@ *) echo usage $0 [-A] [-a\ [-d] [-f]; exit 0;; esac done + if [ "$1" = -- ]; then + if [ "$A$D$F" = "" ]; then + A=1;D=1;F=1 + fi + fi + shift `expr $OPTIND - 1` fi if [ -n "$D" ]; then - make debug 2>&1 | tee LOGD + make $@ debug 2>&1 | tee LOGD fi if [ -n "$A" ]; then - make assert 2>&1 | tee LOGA + make $@ assert 2>&1 | tee LOGA fi if [ -n "$F" ]; then - make 2>&1 | tee LOGF + make $@ 2>&1 | tee LOGF fi Modified: branches/Cog/build.macos32x86/squeak.stack.spur/mvm =================================================================== --- branches/Cog/build.macos32x86/squeak.stack.spur/mvm 2016-03-28 21:23:28 UTC (rev 3659) +++ branches/Cog/build.macos32x86/squeak.stack.spur/mvm 2016-03-28 21:36:20 UTC (rev 3660) @@ -12,13 +12,19 @@ *) echo usage $0 [-A] [-a\ [-d] [-f]; exit 0;; esac done + if [ "$1" = -- ]; then + if [ "$A$D$F" = "" ]; then + A=1;D=1;F=1 + fi + fi + shift `expr $OPTIND - 1` fi if [ -n "$D" ]; then - make debug 2>&1 | tee LOGD + make $@ debug 2>&1 | tee LOGD fi if [ -n "$A" ]; then - make assert 2>&1 | tee LOGA + make $@ assert 2>&1 | tee LOGA fi if [ -n "$F" ]; then - make 2>&1 | tee LOGF + make $@ 2>&1 | tee LOGF fi Modified: branches/Cog/build.macos32x86/squeak.stack.v3/mvm =================================================================== --- branches/Cog/build.macos32x86/squeak.stack.v3/mvm 2016-03-28 21:23:28 UTC (rev 3659) +++ branches/Cog/build.macos32x86/squeak.stack.v3/mvm 2016-03-28 21:36:20 UTC (rev 3660) @@ -12,13 +12,19 @@ *) echo usage $0 [-A] [-a\ [-d] [-f]; exit 0;; esac done + if [ "$1" = -- ]; then + if [ "$A$D$F" = "" ]; then + A=1;D=1;F=1 + fi + fi + shift `expr $OPTIND - 1` fi if [ -n "$D" ]; then - make debug 2>&1 | tee LOGD + make $@ debug 2>&1 | tee LOGD fi if [ -n "$A" ]; then - make assert 2>&1 | tee LOGA + make $@ assert 2>&1 | tee LOGA fi if [ -n "$F" ]; then - make 2>&1 | tee LOGF + make $@ 2>&1 | tee LOGF fi Modified: branches/Cog/build.macos64x64/newspeak.cog.spur/mvm =================================================================== --- branches/Cog/build.macos64x64/newspeak.cog.spur/mvm 2016-03-28 21:23:28 UTC (rev 3659) +++ branches/Cog/build.macos64x64/newspeak.cog.spur/mvm 2016-03-28 21:36:20 UTC (rev 3660) @@ -12,13 +12,19 @@ *) echo usage $0 [-A] [-a\ [-d] [-f]; exit 0;; esac done + if [ "$1" = -- ]; then + if [ "$A$D$F" = "" ]; then + A=1;D=1;F=1 + fi + fi + shift `expr $OPTIND - 1` fi if [ -n "$D" ]; then - make debug 2>&1 | tee LOGD + make $@ debug 2>&1 | tee LOGD fi if [ -n "$A" ]; then - make assert 2>&1 | tee LOGA + make $@ assert 2>&1 | tee LOGA fi if [ -n "$F" ]; then - make 2>&1 | tee LOGF + make $@ 2>&1 | tee LOGF fi Modified: branches/Cog/build.macos64x64/newspeak.stack.spur/mvm =================================================================== --- branches/Cog/build.macos64x64/newspeak.stack.spur/mvm 2016-03-28 21:23:28 UTC (rev 3659) +++ branches/Cog/build.macos64x64/newspeak.stack.spur/mvm 2016-03-28 21:36:20 UTC (rev 3660) @@ -12,13 +12,19 @@ *) echo usage $0 [-A] [-a\ [-d] [-f]; exit 0;; esac done + if [ "$1" = -- ]; then + if [ "$A$D$F" = "" ]; then + A=1;D=1;F=1 + fi + fi + shift `expr $OPTIND - 1` fi if [ -n "$D" ]; then - make debug 2>&1 | tee LOGD + make $@ debug 2>&1 | tee LOGD fi if [ -n "$A" ]; then - make assert 2>&1 | tee LOGA + make $@ assert 2>&1 | tee LOGA fi if [ -n "$F" ]; then - make 2>&1 | tee LOGF + make $@ 2>&1 | tee LOGF fi Modified: branches/Cog/build.macos64x64/pharo.cog.spur/mvm =================================================================== --- branches/Cog/build.macos64x64/pharo.cog.spur/mvm 2016-03-28 21:23:28 UTC (rev 3659) +++ branches/Cog/build.macos64x64/pharo.cog.spur/mvm 2016-03-28 21:36:20 UTC (rev 3660) @@ -12,13 +12,19 @@ *) echo usage $0 [-A] [-a\ [-d] [-f]; exit 0;; esac done + if [ "$1" = -- ]; then + if [ "$A$D$F" = "" ]; then + A=1;D=1;F=1 + fi + fi + shift `expr $OPTIND - 1` fi if [ -n "$D" ]; then - make debug 2>&1 | tee LOGD + make $@ debug 2>&1 | tee LOGD fi if [ -n "$A" ]; then - make assert 2>&1 | tee LOGA + make $@ assert 2>&1 | tee LOGA fi if [ -n "$F" ]; then - make 2>&1 | tee LOGF + make $@ 2>&1 | tee LOGF fi Modified: branches/Cog/build.macos64x64/squeak.cog.spur/mvm =================================================================== --- branches/Cog/build.macos64x64/squeak.cog.spur/mvm 2016-03-28 21:23:28 UTC (rev 3659) +++ branches/Cog/build.macos64x64/squeak.cog.spur/mvm 2016-03-28 21:36:20 UTC (rev 3660) @@ -12,13 +12,19 @@ *) echo usage $0 [-A] [-a\ [-d] [-f]; exit 0;; esac done + if [ "$1" = -- ]; then + if [ "$A$D$F" = "" ]; then + A=1;D=1;F=1 + fi + fi + shift `expr $OPTIND - 1` fi if [ -n "$D" ]; then - make debug 2>&1 | tee LOGD + make $@ debug 2>&1 | tee LOGD fi if [ -n "$A" ]; then - make assert 2>&1 | tee LOGA + make $@ assert 2>&1 | tee LOGA fi if [ -n "$F" ]; then - make 2>&1 | tee LOGF + make $@ 2>&1 | tee LOGF fi Modified: branches/Cog/build.macos64x64/squeak.cog.spur.immutability/mvm =================================================================== --- branches/Cog/build.macos64x64/squeak.cog.spur.immutability/mvm 2016-03-28 21:23:28 UTC (rev 3659) +++ branches/Cog/build.macos64x64/squeak.cog.spur.immutability/mvm 2016-03-28 21:36:20 UTC (rev 3660) @@ -12,13 +12,19 @@ *) echo usage $0 [-A] [-a\ [-d] [-f]; exit 0;; esac done + if [ "$1" = -- ]; then + if [ "$A$D$F" = "" ]; then + A=1;D=1;F=1 + fi + fi + shift `expr $OPTIND - 1` fi if [ -n "$D" ]; then - make debug 2>&1 | tee LOGD + make $@ debug 2>&1 | tee LOGD fi if [ -n "$A" ]; then - make assert 2>&1 | tee LOGA + make $@ assert 2>&1 | tee LOGA fi if [ -n "$F" ]; then - make 2>&1 | tee LOGF + make $@ 2>&1 | tee LOGF fi Modified: branches/Cog/build.macos64x64/squeak.sista.spur/mvm =================================================================== --- branches/Cog/build.macos64x64/squeak.sista.spur/mvm 2016-03-28 21:23:28 UTC (rev 3659) +++ branches/Cog/build.macos64x64/squeak.sista.spur/mvm 2016-03-28 21:36:20 UTC (rev 3660) @@ -12,13 +12,19 @@ *) echo usage $0 [-A] [-a\ [-d] [-f]; exit 0;; esac done + if [ "$1" = -- ]; then + if [ "$A$D$F" = "" ]; then + A=1;D=1;F=1 + fi + fi + shift `expr $OPTIND - 1` fi if [ -n "$D" ]; then - make debug 2>&1 | tee LOGD + make $@ debug 2>&1 | tee LOGD fi if [ -n "$A" ]; then - make assert 2>&1 | tee LOGA + make $@ assert 2>&1 | tee LOGA fi if [ -n "$F" ]; then - make 2>&1 | tee LOGF + make $@ 2>&1 | tee LOGF fi Modified: branches/Cog/build.macos64x64/squeak.stack.spur/mvm =================================================================== --- branches/Cog/build.macos64x64/squeak.stack.spur/mvm 2016-03-28 21:23:28 UTC (rev 3659) +++ branches/Cog/build.macos64x64/squeak.stack.spur/mvm 2016-03-28 21:36:20 UTC (rev 3660) @@ -12,13 +12,19 @@ *) echo usage $0 [-A] [-a\ [-d] [-f]; exit 0;; esac done + if [ "$1" = -- ]; then + if [ "$A$D$F" = "" ]; then + A=1;D=1;F=1 + fi + fi + shift `expr $OPTIND - 1` fi if [ -n "$D" ]; then - make debug 2>&1 | tee LOGD + make $@ debug 2>&1 | tee LOGD fi if [ -n "$A" ]; then - make assert 2>&1 | tee LOGA + make $@ assert 2>&1 | tee LOGA fi if [ -n "$F" ]; then - make 2>&1 | tee LOGF + make $@ 2>&1 | tee LOGF fi Modified: branches/Cog/build.win32x86/newspeak.cog.spur/mvm =================================================================== --- branches/Cog/build.win32x86/newspeak.cog.spur/mvm 2016-03-28 21:23:28 UTC (rev 3659) +++ branches/Cog/build.win32x86/newspeak.cog.spur/mvm 2016-03-28 21:36:20 UTC (rev 3660) @@ -12,16 +12,22 @@ *) echo usage $0 [-A] [-a\ [-d] [-f]; exit 0;; esac done + if [ "$1" = -- ]; then + if [ "$A$D$F" = "" ]; then + A=1;D=1;F=1 + fi + fi + shift `expr $OPTIND - 1` fi if [ -n "$D" ]; then - rm -rf builddbg/vm/nsvm*.exe + rm -rf builddbg/vm/*.exe make debug 2>&1 | tee LOGD fi if [ -n "$A" ]; then - rm -rf buildast/vm/nsvm*.exe + rm -rf buildast/vm/*.exe make assert 2>&1 | tee LOGA fi if [ -n "$F" ]; then - rm -rf build/vm/nsvm*.exe + rm -rf build/vm/*.exe make 2>&1 | tee LOGF fi Modified: branches/Cog/build.win32x86/newspeak.stack.spur/mvm =================================================================== --- branches/Cog/build.win32x86/newspeak.stack.spur/mvm 2016-03-28 21:23:28 UTC (rev 3659) +++ branches/Cog/build.win32x86/newspeak.stack.spur/mvm 2016-03-28 21:36:20 UTC (rev 3660) @@ -12,16 +12,22 @@ *) echo usage $0 [-A] [-a\ [-d] [-f]; exit 0;; esac done + if [ "$1" = -- ]; then + if [ "$A$D$F" = "" ]; then + A=1;D=1;F=1 + fi + fi + shift `expr $OPTIND - 1` fi if [ -n "$D" ]; then - rm -rf builddbg/vm/nsvm*.exe + rm -rf builddbg/vm/*.exe make debug 2>&1 | tee LOGD fi if [ -n "$A" ]; then - rm -rf buildast/vm/nsvm*.exe + rm -rf buildast/vm/*.exe make assert 2>&1 | tee LOGA fi if [ -n "$F" ]; then - rm -rf build/vm/nsvm*.exe + rm -rf build/vm/*.exe make 2>&1 | tee LOGF fi Modified: branches/Cog/build.win32x86/squeak.cog.spur/mvm =================================================================== --- branches/Cog/build.win32x86/squeak.cog.spur/mvm 2016-03-28 21:23:28 UTC (rev 3659) +++ branches/Cog/build.win32x86/squeak.cog.spur/mvm 2016-03-28 21:36:20 UTC (rev 3660) @@ -12,16 +12,22 @@ *) echo usage $0 [-A] [-a\ [-d] [-f]; exit 0;; esac done + if [ "$1" = -- ]; then + if [ "$A$D$F" = "" ]; then + A=1;D=1;F=1 + fi + fi + shift `expr $OPTIND - 1` fi if [ -n "$D" ]; then - rm -rf builddbg/vm/Squeak*.exe + rm -rf builddbg/vm/*.exe make debug 2>&1 | tee LOGD fi if [ -n "$A" ]; then - rm -rf buildast/vm/Squeak*.exe + rm -rf buildast/vm/*.exe make assert 2>&1 | tee LOGA fi if [ -n "$F" ]; then - rm -rf build/vm/Squeak*.exe + rm -rf build/vm/*.exe make 2>&1 | tee LOGF fi Modified: branches/Cog/build.win32x86/squeak.cog.v3/mvm =================================================================== --- branches/Cog/build.win32x86/squeak.cog.v3/mvm 2016-03-28 21:23:28 UTC (rev 3659) +++ branches/Cog/build.win32x86/squeak.cog.v3/mvm 2016-03-28 21:36:20 UTC (rev 3660) @@ -12,16 +12,22 @@ *) echo usage $0 [-A] [-a\ [-d] [-f]; exit 0;; esac done + if [ "$1" = -- ]; then + if [ "$A$D$F" = "" ]; then + A=1;D=1;F=1 + fi + fi + shift `expr $OPTIND - 1` fi if [ -n "$D" ]; then - rm -rf builddbg/vm/Squeak*.exe + rm -rf builddbg/vm/*.exe make debug 2>&1 | tee LOGD fi if [ -n "$A" ]; then - rm -rf buildast/vm/Squeak*.exe + rm -rf buildast/vm/*.exe make assert 2>&1 | tee LOGA fi if [ -n "$F" ]; then - rm -rf build/vm/Squeak*.exe + rm -rf build/vm/*.exe make 2>&1 | tee LOGF fi Modified: branches/Cog/build.win32x86/squeak.stack.spur/mvm =================================================================== --- branches/Cog/build.win32x86/squeak.stack.spur/mvm 2016-03-28 21:23:28 UTC (rev 3659) +++ branches/Cog/build.win32x86/squeak.stack.spur/mvm 2016-03-28 21:36:20 UTC (rev 3660) @@ -12,16 +12,22 @@ *) echo usage $0 [-A] [-a\ [-d] [-f]; exit 0;; esac done + if [ "$1" = -- ]; then + if [ "$A$D$F" = "" ]; then + A=1;D=1;F=1 + fi + fi + shift `expr $OPTIND - 1` fi if [ -n "$D" ]; then - rm -rf builddbg/vm/Squeak*.exe + rm -rf builddbg/vm/*.exe make debug 2>&1 | tee LOGD fi if [ -n "$A" ]; then - rm -rf buildast/vm/Squeak*.exe + rm -rf buildast/vm/*.exe make assert 2>&1 | tee LOGA fi if [ -n "$F" ]; then - rm -rf build/vm/Squeak*.exe + rm -rf build/vm/*.exe make 2>&1 | tee LOGF fi Modified: branches/Cog/build.win32x86/squeak.stack.v3/mvm =================================================================== --- branches/Cog/build.win32x86/squeak.stack.v3/mvm 2016-03-28 21:23:28 UTC (rev 3659) +++ branches/Cog/build.win32x86/squeak.stack.v3/mvm 2016-03-28 21:36:20 UTC (rev 3660) @@ -12,16 +12,22 @@ *) echo usage $0 [-A] [-a\ [-d] [-f]; exit 0;; esac done + if [ "$1" = -- ]; then + if [ "$A$D$F" = "" ]; then + A=1;D=1;F=1 + fi + fi + shift `expr $OPTIND - 1` fi if [ -n "$D" ]; then - rm -rf builddbg/vm/Squeak*.exe + rm -rf builddbg/vm/*.exe make debug 2>&1 | tee LOGD fi if [ -n "$A" ]; then - rm -rf buildast/vm/Squeak*.exe + rm -rf buildast/vm/*.exe make assert 2>&1 | tee LOGA fi if [ -n "$F" ]; then - rm -rf build/vm/Squeak*.exe + rm -rf build/vm/*.exe make 2>&1 | tee LOGF fi Modified: branches/Cog/platforms/Cross/vm/sqAtomicOps.h =================================================================== --- branches/Cog/platforms/Cross/vm/sqAtomicOps.h 2016-03-28 21:23:28 UTC (rev 3659) +++ branches/Cog/platforms/Cross/vm/sqAtomicOps.h 2016-03-28 21:36:20 UTC (rev 3660) @@ -157,7 +157,6 @@ # error shurly shome mishtake; too drunk to shpot the programming muddle. hic. #endif - #if defined(__GNUC__) # define GCC_HAS_BUILTIN_SYNC \ (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 1)) @@ -176,11 +175,15 @@ # define sqAtomicAddConst(var,n) (assert(sizeof(var) == 4), OSAtomicAdd32(n,&(var)) #elif defined(__GNUC__) || defined(__clang__) -# if GCC_HAS_BUILTIN_SYNC || defined(__clang__) -# define sqAtomicAddConst(var,n) __sync_fetch_and_add((sqInt *)&(var), n) - -# elif defined(i386) || defined(__i386) || defined(__i386__) || defined(_X86_) - /* support for gcc 3.x; 8-, 16- & 32-bit only */ +/* N.B. I know you want to use the intrinsics; they're pretty; they're official; + * they're portable. But they only apply to int, long and long long sizes. + * Since we want to use 16-bit variables for signal requests and responses in + * sqExternalSemaphores.c we use the assembler constructs. Please /don't/ + * change this unless you understand the use of ATOMICADD16 and you test that + * the replacement works. + */ +# if defined(i386) || defined(__i386) || defined(__i386__) || defined(_X86_) +# define ATOMICADD16 1 # define sqAtomicAddConst(var,n) do {\ if (sizeof(var) == sizeof(char)) \ asm volatile ("lock addb %1, %0" : "=m" (var) : "i" (n), "m" (var)); \ @@ -189,19 +192,28 @@ else \ asm volatile ("lock addl %1, %0" : "=m" (var) : "i" (n), "m" (var)); \ } while (0) -# endif - -/* On x86/x86_64 the intrinsics apply to any integral size */ -# if defined(i386) || defined(__i386) || defined(__i386__) || defined(_X86_) \ - || defined(x86_64) || defined(__x86_64) || defined(__x86_64__) +# elif defined(x86_64) || defined(__x86_64) || defined(__x86_64__) # define ATOMICADD16 1 +# define sqAtomicAddConst(var,n) do {\ + if (sizeof(var) == sizeof(char)) \ + asm volatile ("lock addb %1, %0" : "=m" (var) : "i" (n), "m" (var)); \ + else if (sizeof(var) == sizeof(short)) \ + asm volatile ("lock addw %1, %0" : "=m" (var) : "i" (n), "m" (var)); \ + else if (sizeof(var) == sizeof(int)) \ + asm volatile ("lock addl %1, %0" : "=m" (var) : "i" (n), "m" (var)); \ + else \ + asm volatile ("lock addq %1, %0" : "=m" (var) : "i" (n), "m" (var)); \ + } while (0) +# elif GCC_HAS_BUILTIN_SYNC || defined(__clang__) +# define sqAtomicAddConst(var,n) __sync_fetch_and_add((sqInt *)&(var), n) # endif +#endif -#else +#if !defined(sqAtomicAddConst) /* Dear implementor, you have choices. Google atomic increment and you will * find a number of alternative implementations. */ -# error atomic increment of variables not yet defined for this platfom +# error atomic increment of variables not yet defined for this platform #endif /* Atomic compare and swap of sqInt variables allows a lock-free implementation Modified: branches/Cog/platforms/Cross/vm/sqExternalSemaphores.c =================================================================== --- branches/Cog/platforms/Cross/vm/sqExternalSemaphores.c 2016-03-28 21:23:28 UTC (rev 3659) +++ branches/Cog/platforms/Cross/vm/sqExternalSemaphores.c 2016-03-28 21:36:20 UTC (rev 3660) @@ -79,7 +79,6 @@ * VM needs to scan. With potentially thousands of indices to scan this can * save significant lengths of time. */ -static volatile int tideLock = 0; static volatile int useTideA = 1; static volatile sqInt lowTideA = (usqInt)-1 >> 1, highTideA = -1; static volatile sqInt lowTideB = (usqInt)-1 >> 1, highTideB = -1; @@ -132,6 +131,7 @@ { int i = index - 1; int v; + SignalRequest b4; /* An index of zero should be and is silently ignored. */ assert(index >= 0 && index <= numSignalRequests); @@ -141,7 +141,14 @@ return 0; sqLowLevelMFence(); + b4 = signalRequests[i]; sqAtomicAddConst(signalRequests[i].requests,1); + /* There's a possibility that the second arm will fail in normal operation, + * but that chance is small; much better to deal with the false positive + * than not notice that the atomic add intrinsic is overwriting responses. + */ + assert(b4.requests != signalRequests[i].requests + && b4.responses == signalRequests[i].responses); if (useTideA) { /* atomic if (lowTideA > i) lowTideA = i; */ while ((v = lowTideA) > i) { @@ -153,6 +160,7 @@ sqLowLevelMFence(); sqCompareAndSwap(highTideA, v, i); } + assert(i >= lowTideA && i <= highTideA); } else { /* atomic if (lowTideB > i) lowTideB = i; */ @@ -165,6 +173,7 @@ sqLowLevelMFence(); sqCompareAndSwap(highTideB, v, i); } + assert(i >= lowTideB && i <= highTideB); } checkSignalRequests = 1; @@ -184,7 +193,8 @@ sqInt doSignalExternalSemaphores(sqInt externalSemaphoreTableSize) { - int i, switched; + long i, lowTide, highTide; + char switched, signalled = 0; sqLowLevelMFence(); if (!checkSignalRequests) @@ -192,40 +202,44 @@ switched = 0; checkSignalRequests = 0; + sqLowLevelMFence(); - - LogEventChain((dbgEvtChF,"dSES(%d).",externalSemaphoreTableSize)); if (useTideA) { + lowTideB = (unsigned long)-1 >> 1; + highTideB = -1; useTideA = 0; sqLowLevelMFence(); - /* doing this here saves a bounds check in doSignalSemaphoreWithIndex */ - if (highTideA >= externalSemaphoreTableSize) - highTideA = externalSemaphoreTableSize - 1; - for (i = lowTideA; i <= highTideA; i++) - while (signalRequests[i].responses != signalRequests[i].requests) { - if (doSignalSemaphoreWithIndex(i+1)) - switched = 1; - LogEventChain((dbgEvtChF,"dSSI(%d):%c.",i+1,switched?'!':'_')); - ++signalRequests[i].responses; - } - lowTideA = (unsigned long)-1 >> 1, highTideA = -1; + lowTide = lowTideA; + highTide = highTideA; } else { + lowTideA = (unsigned long)-1 >> 1; + highTideA = -1; useTideA = 1; sqLowLevelMFence(); - /* doing this here saves a bounds check in doSignalSemaphoreWithIndex */ - if (highTideB >= externalSemaphoreTableSize) - highTideB = externalSemaphoreTableSize - 1; - for (i = lowTideB; i <= highTideB; i++) - while (signalRequests[i].responses != signalRequests[i].requests) { - if (doSignalSemaphoreWithIndex(i+1)) - switched = 1; - LogEventChain((dbgEvtChF,"dSSI(%d):%c.",i+1,switched?'!':'_')); - ++signalRequests[i].responses; - } - lowTideB = (unsigned long)-1 >> 1, highTideB = -1; + lowTide = lowTideB; + highTide = highTideB; } + sqLowLevelMFence(); + LogEventChain((dbgEvtChF,"dSES(%d,%d,%ld,%ld).", + externalSemaphoreTableSize, useTideA ? 0 : 1, lowTide, highTide)); + + /* doing this here saves a bounds check in doSignalSemaphoreWithIndex */ + if (highTide >= externalSemaphoreTableSize) + highTide = externalSemaphoreTableSize - 1; + for (i = lowTide; i <= highTide; i++) + while (signalRequests[i].responses != signalRequests[i].requests) { + if (doSignalSemaphoreWithIndex(i+1)) + switched = 1; + LogEventChain((dbgEvtChF,"dSSI(%ld,%d):%c.",i+1,(int)signalRequests[i].responses,switched?'!':'_')); + ++signalRequests[i].responses; + signalled = 1; + } + + if (signalled) + LogEventChain((dbgEvtChF,"\n")); + /* If a signal came in while processing, check for signals again soon. */ sqLowLevelMFence(); Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h ___________________________________________________________________ Modified: checkindate - Wed Mar 23 18:29:03 PDT 2016 + Mon Mar 28 14:31:53 PDT 2016 Modified: branches/Cog/platforms/unix/plugins/SocketPlugin/sqUnixSocket.c =================================================================== --- branches/Cog/platforms/unix/plugins/SocketPlugin/sqUnixSocket.c 2016-03-28 21:23:28 UTC (rev 3659) +++ branches/Cog/platforms/unix/plugins/SocketPlugin/sqUnixSocket.c 2016-03-28 21:36:20 UTC (rev 3660) @@ -171,8 +171,8 @@ #define PING(S,EVT) \ { \ + FPRINTF((stderr, "notify %d %s\n", (S)->s, #EVT)); \ interpreterProxy->signalSemaphoreWithIndex((S)->EVT##Sema); \ - FPRINTF((stderr, "notify %d %s\n", (S)->s, #EVT)); \ } #define notify(SOCK,MASK) \ Modified: branches/Cog/spursrc/vm/gcc3x-cointerp.c =================================================================== --- branches/Cog/spursrc/vm/gcc3x-cointerp.c 2016-03-28 21:23:28 UTC (rev 3659) +++ branches/Cog/spursrc/vm/gcc3x-cointerp.c 2016-03-28 21:36:20 UTC (rev 3660) @@ -1577,7 +1577,6 @@ _iss sqInt * freeLists; _iss sqInt traceLogIndex; _iss sqInt rememberedSetSize; -_iss char * stackLimit; _iss sqInt classTableFirstPage; _iss sqInt tempOop; _iss sqInt * rememberedSet; @@ -1759,6 +1758,7 @@ char * breakSelector; usqInt heapBase; sqInt inIOProcessEvents; +volatile char * stackLimit; void * showSurfaceFn; sqInt deferDisplayUpdates; struct VirtualMachine* interpreterProxy;

1 0

[commit][3659] Get rid of warning about truncated code after #endif
by commits＠squeakvm.org 28 Mar '16

28 Mar '16

Revision: 3659 Author: nice Date: 2016-03-28 14:23:28 -0700 (Mon, 28 Mar 2016) Log Message: ----------- Get rid of warning about truncated code after #endif Modified Paths: -------------- branches/Cog/platforms/Mac OS/plugins/JoystickTabletPlugin/HID_Name_Lookup.c branches/Cog/platforms/Mac OS/plugins/JoystickTabletPlugin/HID_Queue_Utilities.c branches/Cog/platforms/Mac OS/plugins/JoystickTabletPlugin/HID_Utilities.c branches/Cog/platforms/Mac OS/plugins/JoystickTabletPlugin/HID_Utilities_External.h Modified: branches/Cog/platforms/Mac OS/plugins/JoystickTabletPlugin/HID_Name_Lookup.c =================================================================== --- branches/Cog/platforms/Mac OS/plugins/JoystickTabletPlugin/HID_Name_Lookup.c 2016-03-28 21:17:33 UTC (rev 3658) +++ branches/Cog/platforms/Mac OS/plugins/JoystickTabletPlugin/HID_Name_Lookup.c 2016-03-28 21:23:28 UTC (rev 3659) @@ -304,7 +304,7 @@ sprintf(pName, "#{V:Macsense, P:FunPad F-107, C:%ld}#", pCookie); #else result = false; -#endif FAKE_IT +#endif //FAKE_IT break; } default: @@ -312,7 +312,7 @@ sprintf(pName, "#{V:Macsense, P:%ld, C:%ld}#", pProductID, pCookie); #else result = false; -#endif FAKE_IT +#endif //FAKE_IT break; } break; @@ -321,7 +321,7 @@ sprintf(pName, "#{V:%ld, P:%ld, C:%ld}#", pVendorID, pProductID, pCookie); #else result = false; -#endif FAKE_IT +#endif //FAKE_IT break; } return result; Modified: branches/Cog/platforms/Mac OS/plugins/JoystickTabletPlugin/HID_Queue_Utilities.c =================================================================== --- branches/Cog/platforms/Mac OS/plugins/JoystickTabletPlugin/HID_Queue_Utilities.c 2016-03-28 21:17:33 UTC (rev 3658) +++ branches/Cog/platforms/Mac OS/plugins/JoystickTabletPlugin/HID_Queue_Utilities.c 2016-03-28 21:23:28 UTC (rev 3659) @@ -373,7 +373,7 @@ CFRelease(pDevice->queueRunLoopSource); pDevice->queueRunLoopSource = NULL; } -#endif USE_ASYNC_EVENTS +#endif //USE_ASYNC_EVENTS } else { @@ -576,7 +576,7 @@ result = (*(IOHIDQueueInterface**) pDevice->queue)->setEventCallout(pDevice->queue, callback, pDevice, pDevice); if (kIOReturnSuccess != result) HIDREPORTERRORNUM ("HIDSetQueueCallback - Could not set HID queue callback via setEventCallout.", result); -#endif USE_ASYNC_EVENTS +#endif //USE_ASYNC_EVENTS } else HIDREPORTERROR ("HIDSetQueueCallback - invalid device and/or element."); Modified: branches/Cog/platforms/Mac OS/plugins/JoystickTabletPlugin/HID_Utilities.c =================================================================== --- branches/Cog/platforms/Mac OS/plugins/JoystickTabletPlugin/HID_Utilities.c 2016-03-28 21:17:33 UTC (rev 3658) +++ branches/Cog/platforms/Mac OS/plugins/JoystickTabletPlugin/HID_Utilities.c 2016-03-28 21:23:28 UTC (rev 3659) @@ -646,7 +646,7 @@ hid_DisposeDevice ((pRecDevice) target); } -#endif USE_NOTIFICATIONS +#endif //USE_NOTIFICATIONS //================================================================================================ // @@ -775,7 +775,7 @@ #if 0 if (kIOReturnSuccess != result) HIDReportErrorNum ("hid_DisposeDevice: HIDDequeueDevice error: 0x%8.8X.", result); -#endif 1 +#endif //1 hid_DisposeDeviceElements (pDevice->pListElements); pDevice->pListElements = NULL; @@ -1105,7 +1105,7 @@ return true; } } -#endif USE_NOTIFICATIONS +#endif //USE_NOTIFICATIONS // IOServiceGetMatchingServices consumes a reference to the dictionary, so we don't need to release the dictionary ref. hidMatchDictionary = NULL; } Modified: branches/Cog/platforms/Mac OS/plugins/JoystickTabletPlugin/HID_Utilities_External.h =================================================================== --- branches/Cog/platforms/Mac OS/plugins/JoystickTabletPlugin/HID_Utilities_External.h 2016-03-28 21:17:33 UTC (rev 3658) +++ branches/Cog/platforms/Mac OS/plugins/JoystickTabletPlugin/HID_Utilities_External.h 2016-03-28 21:23:28 UTC (rev 3659) @@ -53,7 +53,7 @@ typedef void (*IOHIDCallbackFunction)(void * target, unsigned long result, void* refcon, void * sender); #else #include <IOKit/hid/IOHIDLib.h> -#endif TARGET_RT_MAC_CFM +#endif //TARGET_RT_MAC_CFM #include <stdio.h>

1 0

VM Maker: VMMaker.oscog-eem.1746.mcz
by commits＠source.squeak.org 28 Mar '16

28 Mar '16

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.1746.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.1746 Author: eem Time: 1 January 1970, 2:20:29.877909 pm UUID: 9e4a49eb-8ebe-486d-b6f0-430100efa288 Ancestors: VMMaker.oscog-nice.1745 Modify generateAbs:on:indent: to generate fabsf for float. Write the case statement a little more declaratively/extensibly. =============== Diff against VMMaker.oscog-nice.1745 =============== Item was changed: ----- Method: CCodeGenerator>>generateAbs:on:indent: (in category 'C translation') ----- generateAbs: msgNode on: aStream indent: level "Generate the C code for this message onto the given stream." | type strippedType absFun | type := self typeFor: msgNode receiver in: currentMethod. strippedType := (type beginsWith: 'unsigned ') ifTrue: [type allButFirst: 'unsigned ' size] ifFalse: [(type beginsWith: 'u') ifTrue: [type allButFirst: 1] ifFalse: [type]]. + absFun := + (#( ('long long' llabs) ('__int64' #llabs) ('int64_t' #llabs) + (sqInt SQABS) + (sqLong SQLABS) + (double fabs) + (float fabsf)) + detect: [:tuple| strippedType beginsWith: tuple first] + ifNone: []) + ifNotNil: [:tuple| tuple last] + ifNil: [#abs]. - absFun := (#('long long' '__int64' 'int64_t') anySatisfy: [:t| strippedType beginsWith: t]) ifTrue: [#llabs] - ifFalse: [(strippedType beginsWith: #sqInt) ifTrue: [#SQABS] - ifFalse: [(strippedType beginsWith: #sqLong) ifTrue: [#SQLABS] - ifFalse: [(#('float' 'double') anySatisfy: [:t| strippedType beginsWith: t]) ifTrue: [#fabs] - ifFalse: [#abs]]]]. aStream nextPutAll: absFun. aStream nextPut: $(. self emitCExpression: msgNode receiver on: aStream. + aStream nextPut: $)! - aStream nextPut: $).!

1 0

[commit][3658] Suppress a warning related to doubled parenthesis ((...))
by commits＠squeakvm.org 28 Mar '16

28 Mar '16

Revision: 3658 Author: nice Date: 2016-03-28 14:17:33 -0700 (Mon, 28 Mar 2016) Log Message: ----------- Suppress a warning related to doubled parenthesis ((...)) Modified Paths: -------------- branches/Cog/platforms/Mac OS/plugins/FilePlugin/sqMacUnixFileInterface.c Modified: branches/Cog/platforms/Mac OS/plugins/FilePlugin/sqMacUnixFileInterface.c =================================================================== --- branches/Cog/platforms/Mac OS/plugins/FilePlugin/sqMacUnixFileInterface.c 2016-03-28 20:59:06 UTC (rev 3657) +++ branches/Cog/platforms/Mac OS/plugins/FilePlugin/sqMacUnixFileInterface.c 2016-03-28 21:17:33 UTC (rev 3658) @@ -202,7 +202,7 @@ *isDirectory = false; *sizeIfFile = 0; - if ((pathStringLength == 0)) + if (pathStringLength == 0) strcpy(unixPath, "."); else { if (!ioFilenamefromStringofLengthresolveAliasesRetry(unixPath, pathString,pathStringLength, true, true)) @@ -308,7 +308,7 @@ *isDirectory = false; *sizeIfFile = 0; - if ((pathStringLength == 0)) + if (pathStringLength == 0) strcpy(unixPath, "."); else { if (!ioFilenamefromStringofLengthresolveAliasesRetry(unixPath, pathString,pathStringLength, true, true))

1 0

[commit][3657] Remove obsolete comment, we do not provide a sqCompareAndSwapRes anymore
by commits＠squeakvm.org 28 Mar '16

28 Mar '16

Revision: 3657 Author: nice Date: 2016-03-28 13:59:06 -0700 (Mon, 28 Mar 2016) Log Message: ----------- Remove obsolete comment, we do not provide a sqCompareAndSwapRes anymore Modified Paths: -------------- branches/Cog/platforms/Cross/vm/sqAtomicOps.h Modified: branches/Cog/platforms/Cross/vm/sqAtomicOps.h =================================================================== --- branches/Cog/platforms/Cross/vm/sqAtomicOps.h 2016-03-28 20:18:24 UTC (rev 3656) +++ branches/Cog/platforms/Cross/vm/sqAtomicOps.h 2016-03-28 20:59:06 UTC (rev 3657) @@ -6,7 +6,6 @@ * Atomic 32-bit increment (e.g. for signalSemaphoreWithIndex:). * sqAtomicAddConst(var,n) * sqCompareAndSwap(var,old,new) -* sqCompareAndSwapRes(var,old,new,res) * FILE: sqAtomicOps.h * * AUTHOR: Eliot Miranda

1 0

vm problem on cog and stack spur
by Nicolas Cellier 28 Mar '16

28 Mar '16

It's me again, here is my 2nd problem: I've got an ArbitraryPrecisionFloatTest failing with latest VMMaker.oscog changes (testErf). This test was green previously - for example when I recompile VM source from SVN head revision - eliot 3651 which is also VMMaker.oscog-eem.1740 So it's most probably related to my recent refactorings on LargeIntegers. Of course, Number tests pass, so I don't have a real unit test failing, more a kind of integration test because ArbitraryPrecisionFloat is shaking the integer arithmetic really hard. The same changes are already on interpreter vm since july 2014... So that's another flavour to test. And of course, the same kind of changes, but not exactly the same changes are in my own VM branch which I used to develop ArbitraryPrecisionFloat. I'm puzzled because I changed very few. Right now my commit right is turning into a kind of hell :( But I want to let you know there might be a problem with latest VMMaker cheers

4 8

[commit][3656] Avoid nested comment in LocalePlugin
by commits＠squeakvm.org 28 Mar '16

28 Mar '16

Revision: 3656 Author: nice Date: 2016-03-28 13:18:24 -0700 (Mon, 28 Mar 2016) Log Message: ----------- Avoid nested comment in LocalePlugin Modified Paths: -------------- trunk/platforms/Cross/plugins/LocalePlugin/LocalePlugin.h Modified: trunk/platforms/Cross/plugins/LocalePlugin/LocalePlugin.h =================================================================== --- trunk/platforms/Cross/plugins/LocalePlugin/LocalePlugin.h 2016-03-28 20:13:26 UTC (rev 3655) +++ trunk/platforms/Cross/plugins/LocalePlugin/LocalePlugin.h 2016-03-28 20:18:24 UTC (rev 3656) @@ -87,7 +87,7 @@ /* return the size in chars of the time format string */ sqInt sqLocTimeFormatSize(void); /* write the string describing the time formatting into string ptr. -/* Format is made up of + * Format is made up of * h hour (h 12, H 24), m minute, s seconds, x (am/pm String) * double symbol is null padded, single not padded (h=6, hh=06) */ void sqLocGetTimeFormatInto(char * str);

1 0

[commit][3655] Use single precision floating point constant in OpenGL renderer
by commits＠squeakvm.org 28 Mar '16

28 Mar '16

Revision: 3655 Author: nice Date: 2016-03-28 13:13:26 -0700 (Mon, 28 Mar 2016) Log Message: ----------- Use single precision floating point constant in OpenGL renderer Modified Paths: -------------- trunk/platforms/Cross/plugins/B3DAcceleratorPlugin/sqOpenGLRenderer.c Modified: trunk/platforms/Cross/plugins/B3DAcceleratorPlugin/sqOpenGLRenderer.c =================================================================== --- trunk/platforms/Cross/plugins/B3DAcceleratorPlugin/sqOpenGLRenderer.c 2016-03-28 01:59:24 UTC (rev 3654) +++ trunk/platforms/Cross/plugins/B3DAcceleratorPlugin/sqOpenGLRenderer.c 2016-03-28 20:13:26 UTC (rev 3655) @@ -33,7 +33,7 @@ #warning "This system does not support OpenGL 1.1" #endif -static float blackLight[4] = { 0.0, 0.0, 0.0, 0.0 }; +static float blackLight[4] = { 0.0f, 0.0f, 0.0f, 0.0f }; /*****************************************************************************/ /*****************************************************************************/ @@ -357,10 +357,10 @@ if(!renderer || !glMakeCurrentRenderer(renderer)) return 0; DPRINTF3D(5, (fp, "### Clearing viewport buffer\n")); glClearColor( - ((rgba >> 16) & 255) / 255.0, - ((rgba >> 8) & 255) / 255.0, - (rgba & 255) / 255.0, - (rgba >> 24) / 255.0); + ((rgba >> 16) & 255) / 255.0f, + ((rgba >> 8) & 255) / 255.0f, + (rgba & 255) / 255.0f, + (rgba >> 24) / 255.0f); glClear(GL_COLOR_BUFFER_BIT); ERROR_CHECK; return 1; @@ -561,7 +561,7 @@ pos[0] = light->position[0]; pos[1] = light->position[1]; pos[2] = light->position[2]; - pos[3] = 1.0; + pos[3] = 1.0f; /* @@@ FIXME: Squeak pre-transforms the light @@@ */ glPushMatrix(); glLoadIdentity(); @@ -573,7 +573,7 @@ pos[0] = light->direction[0]; pos[1] = light->direction[1]; pos[2] = light->direction[2]; - pos[3] = 0.0; + pos[3] = 0.0f; /* @@@ FIXME: Squeak pre-transforms the light @@@ */ glPushMatrix(); glLoadIdentity(); @@ -593,11 +593,11 @@ ERROR_CHECK; } else { DPRINTF3D(5, (fp, "\tattenuation: OFF (1, 0, 0)\n")); - glLightf(index, GL_CONSTANT_ATTENUATION, 1.0); + glLightf(index, GL_CONSTANT_ATTENUATION, 1.0f); ERROR_CHECK; - glLightf(index, GL_LINEAR_ATTENUATION, 0.0); + glLightf(index, GL_LINEAR_ATTENUATION, 0.0f); ERROR_CHECK; - glLightf(index, GL_QUADRATIC_ATTENUATION, 0.0); + glLightf(index, GL_QUADRATIC_ATTENUATION, 0.0f); ERROR_CHECK; } @@ -612,9 +612,9 @@ glLightfv(index, GL_SPOT_DIRECTION, light->direction); ERROR_CHECK; } else { - glLightf(index, GL_SPOT_EXPONENT, 0.0); + glLightf(index, GL_SPOT_EXPONENT, 0.0f); ERROR_CHECK; - glLightf(index, GL_SPOT_CUTOFF, 180.0); + glLightf(index, GL_SPOT_CUTOFF, 180.0f); ERROR_CHECK; } return 1; @@ -639,10 +639,10 @@ glFogf(GL_FOG_DENSITY, (GLfloat)density); glFogf(GL_FOG_START, (GLfloat)fogRangeStart); glFogf(GL_FOG_END, (GLfloat)fogRangeEnd); - fogColor[0] = ((rgba >> 16) & 255) / 255.0; - fogColor[1] = ((rgba >> 8) & 255) / 255.0; - fogColor[2] = (rgba & 255) / 255.0; - fogColor[3] = (rgba >> 24) / 255.0; + fogColor[0] = ((rgba >> 16) & 255) / 255.0f; + fogColor[1] = ((rgba >> 8) & 255) / 255.0f; + fogColor[2] = (rgba & 255) / 255.0f; + fogColor[3] = (rgba >> 24) / 255.0f; glFogfv(GL_FOG_COLOR, fogColor); /* enable pixel fog */ glHint(GL_FOG_HINT, GL_NICEST);

1 0

[commit][3654] VMMaker 4.15.5
by commits＠squeakvm.org 28 Mar '16

28 Mar '16

Revision: 3654 Author: lewis Date: 2016-03-27 18:59:24 -0700 (Sun, 27 Mar 2016) Log Message: ----------- VMMaker 4.15.5 Nicolas Cellier's LargeIntegersPlugin improvements from oscog branch. Modified Paths: -------------- trunk/src/ckformat.c trunk/src/plugins/ADPCMCodecPlugin/ADPCMCodecPlugin.c trunk/src/plugins/AioPlugin/AioPlugin.c trunk/src/plugins/AsynchFilePlugin/AsynchFilePlugin.c trunk/src/plugins/B2DPlugin/B2DPlugin.c trunk/src/plugins/B3DAcceleratorPlugin/B3DAcceleratorPlugin.c trunk/src/plugins/BMPReadWriterPlugin/BMPReadWriterPlugin.c trunk/src/plugins/BitBltPlugin/BitBltPlugin.c trunk/src/plugins/CameraPlugin/CameraPlugin.c trunk/src/plugins/ClipboardExtendedPlugin/ClipboardExtendedPlugin.c trunk/src/plugins/CroquetPlugin/CroquetPlugin.c trunk/src/plugins/DBusPlugin/DBusPlugin.c trunk/src/plugins/DESPlugin/DESPlugin.c trunk/src/plugins/DSAPrims/DSAPrims.c trunk/src/plugins/DropPlugin/DropPlugin.c trunk/src/plugins/FFTPlugin/FFTPlugin.c trunk/src/plugins/FT2Plugin/FT2Plugin.c trunk/src/plugins/FileCopyPlugin/FileCopyPlugin.c trunk/src/plugins/FilePlugin/FilePlugin.c trunk/src/plugins/FloatArrayPlugin/FloatArrayPlugin.c trunk/src/plugins/FloatMathPlugin/FloatMathPlugin.c trunk/src/plugins/GeniePlugin/GeniePlugin.c trunk/src/plugins/HostWindowPlugin/HostWindowPlugin.c trunk/src/plugins/JPEGReadWriter2Plugin/JPEGReadWriter2Plugin.c trunk/src/plugins/JPEGReaderPlugin/JPEGReaderPlugin.c trunk/src/plugins/JoystickTabletPlugin/JoystickTabletPlugin.c trunk/src/plugins/KedamaPlugin2/KedamaPlugin2.c trunk/src/plugins/Klatt/Klatt.c trunk/src/plugins/LargeIntegers/LargeIntegers.c trunk/src/plugins/LocalePlugin/LocalePlugin.c trunk/src/plugins/MD5Plugin/MD5Plugin.c trunk/src/plugins/MIDIPlugin/MIDIPlugin.c trunk/src/plugins/Matrix2x3Plugin/Matrix2x3Plugin.c trunk/src/plugins/MiscPrimitivePlugin/MiscPrimitivePlugin.c trunk/src/plugins/Mpeg3Plugin/Mpeg3Plugin.c trunk/src/plugins/RePlugin/RePlugin.c trunk/src/plugins/RomePlugin/RomePlugin.c trunk/src/plugins/SHA256Plugin/SHA256Plugin.c trunk/src/plugins/ScratchPlugin/ScratchPlugin.c trunk/src/plugins/SecurityPlugin/SecurityPlugin.c trunk/src/plugins/SerialPlugin/SerialPlugin.c trunk/src/plugins/SocketPlugin/SocketPlugin.c trunk/src/plugins/SoundCodecPrims/SoundCodecPrims.c trunk/src/plugins/SoundGenerationPlugin/SoundGenerationPlugin.c trunk/src/plugins/SoundPlugin/SoundPlugin.c trunk/src/plugins/Squeak3D/Squeak3D.c trunk/src/plugins/SqueakFFIPrims/SqueakFFIPrims.c trunk/src/plugins/SqueakSSL/SqueakSSL.c trunk/src/plugins/StarSqueakPlugin/StarSqueakPlugin.c trunk/src/plugins/UUIDPlugin/UUIDPlugin.c trunk/src/plugins/UnicodePlugin/UnicodePlugin.c trunk/src/plugins/UnixOSProcessPlugin/UnixOSProcessPlugin.c trunk/src/plugins/WeDoPlugin/WeDoPlugin.c trunk/src/plugins/XDisplayControlPlugin/XDisplayControlPlugin.c trunk/src/plugins/ZipPlugin/ZipPlugin.c trunk/src/vm/interp.c trunk/src/vm/interp.h trunk/src/vm/sqNamedPrims.h Modified: trunk/src/ckformat.c =================================================================== --- trunk/src/ckformat.c 2016-03-26 22:24:44 UTC (rev 3653) +++ trunk/src/ckformat.c 2016-03-28 01:59:24 UTC (rev 3654) @@ -5,7 +5,7 @@ /* Usage: ckformat imageFileName */ /* --- DO NOT EDIT THIS FILE --- */ -/* --- Automatically generated from class ImageFormat 2016-02-27T17:19:07.769+01:00--- */ +/* --- Automatically generated from class ImageFormat 2016-03-27T21:52:01.822+01:00--- */ /* --- Source code is in package ImageFormat in the VMMaker repository --- */ /* --- DO NOT EDIT THIS FILE --- */ @@ -148,6 +148,20 @@ exit(0); } } + { + unsigned char b_68021_17[8]= { 0, 0, 0, 0, 0, 1, 9, 181}; + if (strncmp(buf, b_68021_17, 8) == 0) { + printf("%d\n", 68021); + exit(0); + } + } + { + unsigned char b_68021_18[8]= { 181, 9, 1, 0, 0, 0, 0, 0}; + if (strncmp(buf, b_68021_18, 8) == 0) { + printf("%d\n", 68021); + exit(0); + } + } if(fseek(f, 512L, SEEK_SET) != 0) { fprintf(stderr, "cannot go to pos %d in %s\n", 512, argv[1]); exit(3); @@ -268,6 +282,20 @@ exit(0); } } + { + unsigned char b_68021_17[8]= { 0, 0, 0, 0, 0, 1, 9, 181}; + if (strncmp(buf, b_68021_17, 8) == 0) { + printf("%d\n", 68021); + exit(0); + } + } + { + unsigned char b_68021_18[8]= { 181, 9, 1, 0, 0, 0, 0, 0}; + if (strncmp(buf, b_68021_18, 8) == 0) { + printf("%d\n", 68021); + exit(0); + } + } printf("0\n"); /* print an invalid format number */ exit (-1); /* not found, exit with error code */ } Modified: trunk/src/plugins/ADPCMCodecPlugin/ADPCMCodecPlugin.c =================================================================== --- trunk/src/plugins/ADPCMCodecPlugin/ADPCMCodecPlugin.c 2016-03-26 22:24:44 UTC (rev 3653) +++ trunk/src/plugins/ADPCMCodecPlugin/ADPCMCodecPlugin.c 2016-03-28 01:59:24 UTC (rev 3654) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.5 with VMMaker 4.15.3 translated as C source on 27 February 2016 5:18:56 pm */ +/* Smalltalk from Squeak4.5 with VMMaker 4.15.5 translated as C source on 27 March 2016 9:51:50 pm */ /* Automatically generated by - VMPluginCodeGenerator VMMaker-dtl.377 uuid: 80df7d73-9bc3-484e-a4ff-45e6d2e8d0dc + VMPluginCodeGenerator VMMaker-dtl.379 uuid: 08564677-5e9d-48d5-a63c-b53bd85489f3 from - ADPCMCodecPlugin VMMaker-dtl.377 uuid: 80df7d73-9bc3-484e-a4ff-45e6d2e8d0dc + ADPCMCodecPlugin VMMaker-dtl.379 uuid: 08564677-5e9d-48d5-a63c-b53bd85489f3 */ -static char __buildInfo[] = "ADPCMCodecPlugin VMMaker-dtl.377 uuid: 80df7d73-9bc3-484e-a4ff-45e6d2e8d0dc " __DATE__ ; +static char __buildInfo[] = "ADPCMCodecPlugin VMMaker-dtl.379 uuid: 08564677-5e9d-48d5-a63c-b53bd85489f3 " __DATE__ ; @@ -70,9 +70,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "ADPCMCodecPlugin 27 February 2016 (i)" + "ADPCMCodecPlugin 27 March 2016 (i)" #else - "ADPCMCodecPlugin 27 February 2016 (e)" + "ADPCMCodecPlugin 27 March 2016 (e)" #endif ; Modified: trunk/src/plugins/AioPlugin/AioPlugin.c =================================================================== --- trunk/src/plugins/AioPlugin/AioPlugin.c 2016-03-26 22:24:44 UTC (rev 3653) +++ trunk/src/plugins/AioPlugin/AioPlugin.c 2016-03-28 01:59:24 UTC (rev 3654) @@ -1,6 +1,6 @@ -/* Smalltalk from Squeak4.5 with VMMaker 4.15.3 translated as C source on 27 February 2016 5:19:07 pm */ +/* Smalltalk from Squeak4.5 with VMMaker 4.15.5 translated as C source on 27 March 2016 9:52:01 pm */ /* Automatically generated by - VMPluginCodeGenerator VMMaker-dtl.377 uuid: 80df7d73-9bc3-484e-a4ff-45e6d2e8d0dc + VMPluginCodeGenerator VMMaker-dtl.379 uuid: 08564677-5e9d-48d5-a63c-b53bd85489f3 from UnixAioPlugin * uuid: nil */ @@ -86,9 +86,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "AioPlugin 27 February 2016 (i)" + "AioPlugin 27 March 2016 (i)" #else - "AioPlugin 27 February 2016 (e)" + "AioPlugin 27 March 2016 (e)" #endif ; Modified: trunk/src/plugins/AsynchFilePlugin/AsynchFilePlugin.c =================================================================== --- trunk/src/plugins/AsynchFilePlugin/AsynchFilePlugin.c 2016-03-26 22:24:44 UTC (rev 3653) +++ trunk/src/plugins/AsynchFilePlugin/AsynchFilePlugin.c 2016-03-28 01:59:24 UTC (rev 3654) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.5 with VMMaker 4.15.3 translated as C source on 27 February 2016 5:18:56 pm */ +/* Smalltalk from Squeak4.5 with VMMaker 4.15.5 translated as C source on 27 March 2016 9:51:50 pm */ /* Automatically generated by - SmartSyntaxPluginCodeGenerator VMMaker-dtl.377 uuid: 80df7d73-9bc3-484e-a4ff-45e6d2e8d0dc + SmartSyntaxPluginCodeGenerator VMMaker-dtl.379 uuid: 08564677-5e9d-48d5-a63c-b53bd85489f3 from - AsynchFilePlugin VMMaker-dtl.377 uuid: 80df7d73-9bc3-484e-a4ff-45e6d2e8d0dc + AsynchFilePlugin VMMaker-dtl.379 uuid: 08564677-5e9d-48d5-a63c-b53bd85489f3 */ -static char __buildInfo[] = "AsynchFilePlugin VMMaker-dtl.377 uuid: 80df7d73-9bc3-484e-a4ff-45e6d2e8d0dc " __DATE__ ; +static char __buildInfo[] = "AsynchFilePlugin VMMaker-dtl.379 uuid: 08564677-5e9d-48d5-a63c-b53bd85489f3 " __DATE__ ; @@ -67,9 +67,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "AsynchFilePlugin 27 February 2016 (i)" + "AsynchFilePlugin 27 March 2016 (i)" #else - "AsynchFilePlugin 27 February 2016 (e)" + "AsynchFilePlugin 27 March 2016 (e)" #endif ; static void * sCOAFfn; Modified: trunk/src/plugins/B2DPlugin/B2DPlugin.c =================================================================== --- trunk/src/plugins/B2DPlugin/B2DPlugin.c 2016-03-26 22:24:44 UTC (rev 3653) +++ trunk/src/plugins/B2DPlugin/B2DPlugin.c 2016-03-28 01:59:24 UTC (rev 3654) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.5 with VMMaker 4.15.3 translated as C source on 27 February 2016 5:18:58 pm */ +/* Smalltalk from Squeak4.5 with VMMaker 4.15.5 translated as C source on 27 March 2016 9:51:52 pm */ /* Automatically generated by - VMPluginCodeGenerator VMMaker-dtl.377 uuid: 80df7d73-9bc3-484e-a4ff-45e6d2e8d0dc + VMPluginCodeGenerator VMMaker-dtl.379 uuid: 08564677-5e9d-48d5-a63c-b53bd85489f3 from - BalloonEnginePlugin VMMaker-dtl.377 uuid: 80df7d73-9bc3-484e-a4ff-45e6d2e8d0dc + BalloonEnginePlugin VMMaker-dtl.379 uuid: 08564677-5e9d-48d5-a63c-b53bd85489f3 */ -static char __buildInfo[] = "BalloonEnginePlugin VMMaker-dtl.377 uuid: 80df7d73-9bc3-484e-a4ff-45e6d2e8d0dc " __DATE__ ; +static char __buildInfo[] = "BalloonEnginePlugin VMMaker-dtl.379 uuid: 08564677-5e9d-48d5-a63c-b53bd85489f3 " __DATE__ ; @@ -447,9 +447,9 @@ static void * loadBBFn; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "B2DPlugin 27 February 2016 (i)" + "B2DPlugin 27 March 2016 (i)" #else - "B2DPlugin 27 February 2016 (e)" + "B2DPlugin 27 March 2016 (e)" #endif ; static int* objBuffer; Modified: trunk/src/plugins/B3DAcceleratorPlugin/B3DAcceleratorPlugin.c =================================================================== --- trunk/src/plugins/B3DAcceleratorPlugin/B3DAcceleratorPlugin.c 2016-03-26 22:24:44 UTC (rev 3653) +++ trunk/src/plugins/B3DAcceleratorPlugin/B3DAcceleratorPlugin.c 2016-03-28 01:59:24 UTC (rev 3654) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.5 with VMMaker 4.15.3 translated as C source on 27 February 2016 5:19:02 pm */ +/* Smalltalk from Squeak4.5 with VMMaker 4.15.5 translated as C source on 27 March 2016 9:51:57 pm */ /* Automatically generated by - VMPluginCodeGenerator VMMaker-dtl.377 uuid: 80df7d73-9bc3-484e-a4ff-45e6d2e8d0dc + VMPluginCodeGenerator VMMaker-dtl.379 uuid: 08564677-5e9d-48d5-a63c-b53bd85489f3 from - B3DAcceleratorPlugin VMMaker-dtl.377 uuid: 80df7d73-9bc3-484e-a4ff-45e6d2e8d0dc + B3DAcceleratorPlugin VMMaker-dtl.379 uuid: 08564677-5e9d-48d5-a63c-b53bd85489f3 */ -static char __buildInfo[] = "B3DAcceleratorPlugin VMMaker-dtl.377 uuid: 80df7d73-9bc3-484e-a4ff-45e6d2e8d0dc " __DATE__ ; +static char __buildInfo[] = "B3DAcceleratorPlugin VMMaker-dtl.379 uuid: 08564677-5e9d-48d5-a63c-b53bd85489f3 " __DATE__ ; @@ -107,9 +107,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "B3DAcceleratorPlugin 27 February 2016 (i)" + "B3DAcceleratorPlugin 27 March 2016 (i)" #else - "B3DAcceleratorPlugin 27 February 2016 (e)" + "B3DAcceleratorPlugin 27 March 2016 (e)" #endif ; Modified: trunk/src/plugins/BMPReadWriterPlugin/BMPReadWriterPlugin.c =================================================================== --- trunk/src/plugins/BMPReadWriterPlugin/BMPReadWriterPlugin.c 2016-03-26 22:24:44 UTC (rev 3653) +++ trunk/src/plugins/BMPReadWriterPlugin/BMPReadWriterPlugin.c 2016-03-28 01:59:24 UTC (rev 3654) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.5 with VMMaker 4.15.3 translated as C source on 27 February 2016 5:18:56 pm */ +/* Smalltalk from Squeak4.5 with VMMaker 4.15.5 translated as C source on 27 March 2016 9:51:50 pm */ /* Automatically generated by - VMPluginCodeGenerator VMMaker-dtl.377 uuid: 80df7d73-9bc3-484e-a4ff-45e6d2e8d0dc + VMPluginCodeGenerator VMMaker-dtl.379 uuid: 08564677-5e9d-48d5-a63c-b53bd85489f3 from - BMPReadWriterPlugin VMMaker-dtl.377 uuid: 80df7d73-9bc3-484e-a4ff-45e6d2e8d0dc + BMPReadWriterPlugin VMMaker-dtl.379 uuid: 08564677-5e9d-48d5-a63c-b53bd85489f3 */ -static char __buildInfo[] = "BMPReadWriterPlugin VMMaker-dtl.377 uuid: 80df7d73-9bc3-484e-a4ff-45e6d2e8d0dc " __DATE__ ; +static char __buildInfo[] = "BMPReadWriterPlugin VMMaker-dtl.379 uuid: 08564677-5e9d-48d5-a63c-b53bd85489f3 " __DATE__ ; @@ -58,9 +58,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "BMPReadWriterPlugin 27 February 2016 (i)" + "BMPReadWriterPlugin 27 March 2016 (i)" #else - "BMPReadWriterPlugin 27 February 2016 (e)" + "BMPReadWriterPlugin 27 March 2016 (e)" #endif ; Modified: trunk/src/plugins/BitBltPlugin/BitBltPlugin.c =================================================================== --- trunk/src/plugins/BitBltPlugin/BitBltPlugin.c 2016-03-26 22:24:44 UTC (rev 3653) +++ trunk/src/plugins/BitBltPlugin/BitBltPlugin.c 2016-03-28 01:59:24 UTC (rev 3654) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.5 with VMMaker 4.15.3 translated as C source on 27 February 2016 5:18:58 pm */ +/* Smalltalk from Squeak4.5 with VMMaker 4.15.5 translated as C source on 27 March 2016 9:51:53 pm */ /* Automatically generated by - SmartSyntaxPluginCodeGenerator VMMaker-dtl.377 uuid: 80df7d73-9bc3-484e-a4ff-45e6d2e8d0dc + SmartSyntaxPluginCodeGenerator VMMaker-dtl.379 uuid: 08564677-5e9d-48d5-a63c-b53bd85489f3 from - BitBltSimulation VMMaker-dtl.377 uuid: 80df7d73-9bc3-484e-a4ff-45e6d2e8d0dc + BitBltSimulation VMMaker-dtl.379 uuid: 08564677-5e9d-48d5-a63c-b53bd85489f3 */ -static char __buildInfo[] = "BitBltSimulation VMMaker-dtl.377 uuid: 80df7d73-9bc3-484e-a4ff-45e6d2e8d0dc " __DATE__ ; +static char __buildInfo[] = "BitBltSimulation VMMaker-dtl.379 uuid: 08564677-5e9d-48d5-a63c-b53bd85489f3 " __DATE__ ; @@ -256,9 +256,9 @@ }; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "BitBltPlugin 27 February 2016 (i)" + "BitBltPlugin 27 March 2016 (i)" #else - "BitBltPlugin 27 February 2016 (e)" + "BitBltPlugin 27 March 2016 (e)" #endif ; static sqInt nWords; Modified: trunk/src/plugins/CameraPlugin/CameraPlugin.c =================================================================== --- trunk/src/plugins/CameraPlugin/CameraPlugin.c 2016-03-26 22:24:44 UTC (rev 3653) +++ trunk/src/plugins/CameraPlugin/CameraPlugin.c 2016-03-28 01:59:24 UTC (rev 3654) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.5 with VMMaker 4.15.3 translated as C source on 27 February 2016 5:19:03 pm */ +/* Smalltalk from Squeak4.5 with VMMaker 4.15.5 translated as C source on 27 March 2016 9:51:57 pm */ /* Automatically generated by - VMPluginCodeGenerator VMMaker-dtl.377 uuid: 80df7d73-9bc3-484e-a4ff-45e6d2e8d0dc + VMPluginCodeGenerator VMMaker-dtl.379 uuid: 08564677-5e9d-48d5-a63c-b53bd85489f3 from - CameraPlugin VMMaker-dtl.377 uuid: 80df7d73-9bc3-484e-a4ff-45e6d2e8d0dc + CameraPlugin VMMaker-dtl.379 uuid: 08564677-5e9d-48d5-a63c-b53bd85489f3 */ -static char __buildInfo[] = "CameraPlugin VMMaker-dtl.377 uuid: 80df7d73-9bc3-484e-a4ff-45e6d2e8d0dc " __DATE__ ; +static char __buildInfo[] = "CameraPlugin VMMaker-dtl.379 uuid: 08564677-5e9d-48d5-a63c-b53bd85489f3 " __DATE__ ; @@ -64,9 +64,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "CameraPlugin 27 February 2016 (i)" + "CameraPlugin 27 March 2016 (i)" #else - "CameraPlugin 27 February 2016 (e)" + "CameraPlugin 27 March 2016 (e)" #endif ; Modified: trunk/src/plugins/ClipboardExtendedPlugin/ClipboardExtendedPlugin.c =================================================================== --- trunk/src/plugins/ClipboardExtendedPlugin/ClipboardExtendedPlugin.c 2016-03-26 22:24:44 UTC (rev 3653) +++ trunk/src/plugins/ClipboardExtendedPlugin/ClipboardExtendedPlugin.c 2016-03-28 01:59:24 UTC (rev 3654) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.5 with VMMaker 4.15.3 translated as C source on 27 February 2016 5:19:03 pm */ +/* Smalltalk from Squeak4.5 with VMMaker 4.15.5 translated as C source on 27 March 2016 9:51:57 pm */ /* Automatically generated by - SmartSyntaxPluginCodeGenerator VMMaker-dtl.377 uuid: 80df7d73-9bc3-484e-a4ff-45e6d2e8d0dc + SmartSyntaxPluginCodeGenerator VMMaker-dtl.379 uuid: 08564677-5e9d-48d5-a63c-b53bd85489f3 from - ClipboardExtendedPlugin VMMaker-dtl.377 uuid: 80df7d73-9bc3-484e-a4ff-45e6d2e8d0dc + ClipboardExtendedPlugin VMMaker-dtl.379 uuid: 08564677-5e9d-48d5-a63c-b53bd85489f3 */ -static char __buildInfo[] = "ClipboardExtendedPlugin VMMaker-dtl.377 uuid: 80df7d73-9bc3-484e-a4ff-45e6d2e8d0dc " __DATE__ ; +static char __buildInfo[] = "ClipboardExtendedPlugin VMMaker-dtl.379 uuid: 08564677-5e9d-48d5-a63c-b53bd85489f3 " __DATE__ ; @@ -61,9 +61,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "ClipboardExtendedPlugin 27 February 2016 (i)" + "ClipboardExtendedPlugin 27 March 2016 (i)" #else - "ClipboardExtendedPlugin 27 February 2016 (e)" + "ClipboardExtendedPlugin 27 March 2016 (e)" #endif ; static sqInt simulator; Modified: trunk/src/plugins/CroquetPlugin/CroquetPlugin.c =================================================================== --- trunk/src/plugins/CroquetPlugin/CroquetPlugin.c 2016-03-26 22:24:44 UTC (rev 3653) +++ trunk/src/plugins/CroquetPlugin/CroquetPlugin.c 2016-03-28 01:59:24 UTC (rev 3654) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.5 with VMMaker 4.15.3 translated as C source on 27 February 2016 5:18:59 pm */ +/* Smalltalk from Squeak4.5 with VMMaker 4.15.5 translated as C source on 27 March 2016 9:51:53 pm */ /* Automatically generated by - VMPluginCodeGenerator VMMaker-dtl.377 uuid: 80df7d73-9bc3-484e-a4ff-45e6d2e8d0dc + VMPluginCodeGenerator VMMaker-dtl.379 uuid: 08564677-5e9d-48d5-a63c-b53bd85489f3 from - CroquetPlugin VMMaker-dtl.377 uuid: 80df7d73-9bc3-484e-a4ff-45e6d2e8d0dc + CroquetPlugin VMMaker-dtl.379 uuid: 08564677-5e9d-48d5-a63c-b53bd85489f3 */ -static char __buildInfo[] = "CroquetPlugin VMMaker-dtl.377 uuid: 80df7d73-9bc3-484e-a4ff-45e6d2e8d0dc " __DATE__ ; +static char __buildInfo[] = "CroquetPlugin VMMaker-dtl.379 uuid: 08564677-5e9d-48d5-a63c-b53bd85489f3 " __DATE__ ; @@ -73,9 +73,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "CroquetPlugin 27 February 2016 (i)" + "CroquetPlugin 27 March 2016 (i)" #else - "CroquetPlugin 27 February 2016 (e)" + "CroquetPlugin 27 March 2016 (e)" #endif ; Modified: trunk/src/plugins/DBusPlugin/DBusPlugin.c =================================================================== --- trunk/src/plugins/DBusPlugin/DBusPlugin.c 2016-03-26 22:24:44 UTC (rev 3653) +++ trunk/src/plugins/DBusPlugin/DBusPlugin.c 2016-03-28 01:59:24 UTC (rev 3654) @@ -1,6 +1,6 @@ -/* Smalltalk from Squeak4.5 with VMMaker 4.15.3 translated as C source on 27 February 2016 5:19:03 pm */ +/* Smalltalk from Squeak4.5 with VMMaker 4.15.5 translated as C source on 27 March 2016 9:51:57 pm */ /* Automatically generated by - SmartSyntaxPluginCodeGenerator VMMaker-dtl.377 uuid: 80df7d73-9bc3-484e-a4ff-45e6d2e8d0dc + SmartSyntaxPluginCodeGenerator VMMaker-dtl.379 uuid: 08564677-5e9d-48d5-a63c-b53bd85489f3 from DBusPlugin DBus-Plugin-dtl.35 uuid: 2ae30f08-4793-4acb-876b-c443a5f5e665 */ @@ -143,9 +143,9 @@ static DBusMessageIter messageIter[DBUS_MAXIMUM_TYPE_RECURSION_DEPTH]; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "DBusPlugin 27 February 2016 (i)" + "DBusPlugin 27 March 2016 (i)" #else - "DBusPlugin 27 February 2016 (e)" + "DBusPlugin 27 March 2016 (e)" #endif ; static sqInt simulator; Modified: trunk/src/plugins/DESPlugin/DESPlugin.c =================================================================== --- trunk/src/plugins/DESPlugin/DESPlugin.c 2016-03-26 22:24:44 UTC (rev 3653) +++ trunk/src/plugins/DESPlugin/DESPlugin.c 2016-03-28 01:59:24 UTC (rev 3654) @@ -1,6 +1,6 @@ -/* Smalltalk from Squeak4.5 with VMMaker 4.15.3 translated as C source on 27 February 2016 5:18:59 pm */ +/* Smalltalk from Squeak4.5 with VMMaker 4.15.5 translated as C source on 27 March 2016 9:51:53 pm */ /* Automatically generated by - VMPluginCodeGenerator VMMaker-dtl.377 uuid: 80df7d73-9bc3-484e-a4ff-45e6d2e8d0dc + VMPluginCodeGenerator VMMaker-dtl.379 uuid: 08564677-5e9d-48d5-a63c-b53bd85489f3 from DESPlugin * CryptographyPlugins-rww.10 uuid: 8beefa4e-8411-4385-93ed-1c5d66481465 */ @@ -69,9 +69,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "DESPlugin 27 February 2016 (i)" + "DESPlugin 27 March 2016 (i)" #else - "DESPlugin 27 February 2016 (e)" + "DESPlugin 27 March 2016 (e)" #endif ; static unsigned char pc1[56] = { Modified: trunk/src/plugins/DSAPrims/DSAPrims.c =================================================================== --- trunk/src/plugins/DSAPrims/DSAPrims.c 2016-03-26 22:24:44 UTC (rev 3653) +++ trunk/src/plugins/DSAPrims/DSAPrims.c 2016-03-28 01:59:24 UTC (rev 3654) @@ -1,6 +1,6 @@ -/* Smalltalk from Squeak4.5 with VMMaker 4.15.3 translated as C source on 27 February 2016 5:18:59 pm */ +/* Smalltalk from Squeak4.5 with VMMaker 4.15.5 translated as C source on 27 March 2016 9:51:53 pm */ /* Automatically generated by - VMPluginCodeGenerator VMMaker-dtl.377 uuid: 80df7d73-9bc3-484e-a4ff-45e6d2e8d0dc + VMPluginCodeGenerator VMMaker-dtl.379 uuid: 08564677-5e9d-48d5-a63c-b53bd85489f3 from DSAPlugin * CryptographyPlugins-rww.10 uuid: 8beefa4e-8411-4385-93ed-1c5d66481465 */ @@ -67,9 +67,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "DSAPrims 27 February 2016 (i)" + "DSAPrims 27 March 2016 (i)" #else - "DSAPrims 27 February 2016 (e)" + "DSAPrims 27 March 2016 (e)" #endif ; static sqInt remainderDigitCount; Modified: trunk/src/plugins/DropPlugin/DropPlugin.c =================================================================== --- trunk/src/plugins/DropPlugin/DropPlugin.c 2016-03-26 22:24:44 UTC (rev 3653) +++ trunk/src/plugins/DropPlugin/DropPlugin.c 2016-03-28 01:59:24 UTC (rev 3654) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.5 with VMMaker 4.15.3 translated as C source on 27 February 2016 5:18:59 pm */ +/* Smalltalk from Squeak4.5 with VMMaker 4.15.5 translated as C source on 27 March 2016 9:51:53 pm */ /* Automatically generated by - VMPluginCodeGenerator VMMaker-dtl.377 uuid: 80df7d73-9bc3-484e-a4ff-45e6d2e8d0dc + VMPluginCodeGenerator VMMaker-dtl.379 uuid: 08564677-5e9d-48d5-a63c-b53bd85489f3 from - DropPlugin VMMaker-dtl.377 uuid: 80df7d73-9bc3-484e-a4ff-45e6d2e8d0dc + DropPlugin VMMaker-dtl.379 uuid: 08564677-5e9d-48d5-a63c-b53bd85489f3 */ -static char __buildInfo[] = "DropPlugin VMMaker-dtl.377 uuid: 80df7d73-9bc3-484e-a4ff-45e6d2e8d0dc " __DATE__ ; +static char __buildInfo[] = "DropPlugin VMMaker-dtl.379 uuid: 08564677-5e9d-48d5-a63c-b53bd85489f3 " __DATE__ ; @@ -62,9 +62,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "DropPlugin 27 February 2016 (i)" + "DropPlugin 27 March 2016 (i)" #else - "DropPlugin 27 February 2016 (e)" + "DropPlugin 27 March 2016 (e)" #endif ; Modified: trunk/src/plugins/FFTPlugin/FFTPlugin.c =================================================================== --- trunk/src/plugins/FFTPlugin/FFTPlugin.c 2016-03-26 22:24:44 UTC (rev 3653) +++ trunk/src/plugins/FFTPlugin/FFTPlugin.c 2016-03-28 01:59:24 UTC (rev 3654) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.5 with VMMaker 4.15.3 translated as C source on 27 February 2016 5:18:59 pm */ +/* Smalltalk from Squeak4.5 with VMMaker 4.15.5 translated as C source on 27 March 2016 9:51:54 pm */ /* Automatically generated by - VMPluginCodeGenerator VMMaker-dtl.377 uuid: 80df7d73-9bc3-484e-a4ff-45e6d2e8d0dc + VMPluginCodeGenerator VMMaker-dtl.379 uuid: 08564677-5e9d-48d5-a63c-b53bd85489f3 from - FFTPlugin VMMaker-dtl.377 uuid: 80df7d73-9bc3-484e-a4ff-45e6d2e8d0dc + FFTPlugin VMMaker-dtl.379 uuid: 08564677-5e9d-48d5-a63c-b53bd85489f3 */ -static char __buildInfo[] = "FFTPlugin VMMaker-dtl.377 uuid: 80df7d73-9bc3-484e-a4ff-45e6d2e8d0dc " __DATE__ ; +static char __buildInfo[] = "FFTPlugin VMMaker-dtl.379 uuid: 08564677-5e9d-48d5-a63c-b53bd85489f3 " __DATE__ ; @@ -68,9 +68,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "FFTPlugin 27 February 2016 (i)" + "FFTPlugin 27 March 2016 (i)" #else - "FFTPlugin 27 February 2016 (e)" + "FFTPlugin 27 March 2016 (e)" #endif ; static sqInt nu; Modified: trunk/src/plugins/FT2Plugin/FT2Plugin.c =================================================================== --- trunk/src/plugins/FT2Plugin/FT2Plugin.c 2016-03-26 22:24:44 UTC (rev 3653) +++ trunk/src/plugins/FT2Plugin/FT2Plugin.c 2016-03-28 01:59:24 UTC (rev 3654) @@ -1,4 +1,4 @@ -/* Smalltalk from Squeak4.5 with VMMaker 4.15.3 translated as C source on 27 February 2016 5:19:04 pm */ +/* Smalltalk from Squeak4.5 with VMMaker 4.15.5 translated as C source on 27 March 2016 9:51:58 pm */ /* Automatically generated by FT2PluginCodeGenerator * FreeType-nice.443 uuid: d8120335-a67f-4a64-94ea-90145046f7dc from @@ -121,9 +121,9 @@ static FT_Library library; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "FT2Plugin 27 February 2016 (i)" + "FT2Plugin 27 March 2016 (i)" #else - "FT2Plugin 27 February 2016 (e)" + "FT2Plugin 27 March 2016 (e)" #endif ; static sqInt simulator; Modified: trunk/src/plugins/FileCopyPlugin/FileCopyPlugin.c =================================================================== --- trunk/src/plugins/FileCopyPlugin/FileCopyPlugin.c 2016-03-26 22:24:44 UTC (rev 3653) +++ trunk/src/plugins/FileCopyPlugin/FileCopyPlugin.c 2016-03-28 01:59:24 UTC (rev 3654) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.5 with VMMaker 4.15.3 translated as C source on 27 February 2016 5:19:04 pm */ +/* Smalltalk from Squeak4.5 with VMMaker 4.15.5 translated as C source on 27 March 2016 9:51:58 pm */ /* Automatically generated by - SmartSyntaxPluginCodeGenerator VMMaker-dtl.377 uuid: 80df7d73-9bc3-484e-a4ff-45e6d2e8d0dc + SmartSyntaxPluginCodeGenerator VMMaker-dtl.379 uuid: 08564677-5e9d-48d5-a63c-b53bd85489f3 from - FileCopyPlugin VMMaker-dtl.377 uuid: 80df7d73-9bc3-484e-a4ff-45e6d2e8d0dc + FileCopyPlugin VMMaker-dtl.379 uuid: 08564677-5e9d-48d5-a63c-b53bd85489f3 */ -static char __buildInfo[] = "FileCopyPlugin VMMaker-dtl.377 uuid: 80df7d73-9bc3-484e-a4ff-45e6d2e8d0dc " __DATE__ ; +static char __buildInfo[] = "FileCopyPlugin VMMaker-dtl.379 uuid: 08564677-5e9d-48d5-a63c-b53bd85489f3 " __DATE__ ; @@ -57,9 +57,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "FileCopyPlugin 27 February 2016 (i)" + "FileCopyPlugin 27 March 2016 (i)" #else - "FileCopyPlugin 27 February 2016 (e)" + "FileCopyPlugin 27 March 2016 (e)" #endif ; static sqInt simulator; Modified: trunk/src/plugins/FilePlugin/FilePlugin.c =================================================================== --- trunk/src/plugins/FilePlugin/FilePlugin.c 2016-03-26 22:24:44 UTC (rev 3653) +++ trunk/src/plugins/FilePlugin/FilePlugin.c 2016-03-28 01:59:24 UTC (rev 3654) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.5 with VMMaker 4.15.3 translated as C source on 27 February 2016 5:18:59 pm */ +/* Smalltalk from Squeak4.5 with VMMaker 4.15.5 translated as C source on 27 March 2016 9:51:54 pm */ /* Automatically generated by - VMPluginCodeGenerator VMMaker-dtl.377 uuid: 80df7d73-9bc3-484e-a4ff-45e6d2e8d0dc + VMPluginCodeGenerator VMMaker-dtl.379 uuid: 08564677-5e9d-48d5-a63c-b53bd85489f3 from - FilePlugin VMMaker-dtl.377 uuid: 80df7d73-9bc3-484e-a4ff-45e6d2e8d0dc + FilePlugin VMMaker-dtl.379 uuid: 08564677-5e9d-48d5-a63c-b53bd85489f3 */ -static char __buildInfo[] = "FilePlugin VMMaker-dtl.377 uuid: 80df7d73-9bc3-484e-a4ff-45e6d2e8d0dc " __DATE__ ; +static char __buildInfo[] = "FilePlugin VMMaker-dtl.379 uuid: 08564677-5e9d-48d5-a63c-b53bd85489f3 " __DATE__ ; @@ -100,9 +100,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "FilePlugin 27 February 2016 (i)" + "FilePlugin 27 March 2016 (i)" #else - "FilePlugin 27 February 2016 (e)" + "FilePlugin 27 March 2016 (e)" #endif ; static void * sCCPfn; Modified: trunk/src/plugins/FloatArrayPlugin/FloatArrayPlugin.c =================================================================== --- trunk/src/plugins/FloatArrayPlugin/FloatArrayPlugin.c 2016-03-26 22:24:44 UTC (rev 3653) +++ trunk/src/plugins/FloatArrayPlugin/FloatArrayPlugin.c 2016-03-28 01:59:24 UTC (rev 3654) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.5 with VMMaker 4.15.3 translated as C source on 27 February 2016 5:18:59 pm */ +/* Smalltalk from Squeak4.5 with VMMaker 4.15.5 translated as C source on 27 March 2016 9:51:54 pm */ /* Automatically generated by - VMPluginCodeGenerator VMMaker-dtl.377 uuid: 80df7d73-9bc3-484e-a4ff-45e6d2e8d0dc + VMPluginCodeGenerator VMMaker-dtl.379 uuid: 08564677-5e9d-48d5-a63c-b53bd85489f3 from - FloatArrayPlugin VMMaker-dtl.377 uuid: 80df7d73-9bc3-484e-a4ff-45e6d2e8d0dc + FloatArrayPlugin VMMaker-dtl.379 uuid: 08564677-5e9d-48d5-a63c-b53bd85489f3 */ -static char __buildInfo[] = "FloatArrayPlugin VMMaker-dtl.377 uuid: 80df7d73-9bc3-484e-a4ff-45e6d2e8d0dc " __DATE__ ; +static char __buildInfo[] = "FloatArrayPlugin VMMaker-dtl.379 uuid: 08564677-5e9d-48d5-a63c-b53bd85489f3 " __DATE__ ; @@ -72,9 +72,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "FloatArrayPlugin 27 February 2016 (i)" + "FloatArrayPlugin 27 March 2016 (i)" #else - "FloatArrayPlugin 27 February 2016 (e)" + "FloatArrayPlugin 27 March 2016 (e)" #endif ; Modified: trunk/src/plugins/FloatMathPlugin/FloatMathPlugin.c =================================================================== --- trunk/src/plugins/FloatMathPlugin/FloatMathPlugin.c 2016-03-26 22:24:44 UTC (rev 3653) +++ trunk/src/plugins/FloatMathPlugin/FloatMathPlugin.c 2016-03-28 01:59:24 UTC (rev 3654) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.5 with VMMaker 4.15.3 translated as C source on 27 February 2016 5:19 pm */ +/* Smalltalk from Squeak4.5 with VMMaker 4.15.5 translated as C source on 27 March 2016 9:51:54 pm */ /* Automatically generated by - VMPluginCodeGenerator VMMaker-dtl.377 uuid: 80df7d73-9bc3-484e-a4ff-45e6d2e8d0dc + VMPluginCodeGenerator VMMaker-dtl.379 uuid: 08564677-5e9d-48d5-a63c-b53bd85489f3 from - FloatMathPlugin VMMaker-dtl.377 uuid: 80df7d73-9bc3-484e-a4ff-45e6d2e8d0dc + FloatMathPlugin VMMaker-dtl.379 uuid: 08564677-5e9d-48d5-a63c-b53bd85489f3 */ -static char __buildInfo[] = "FloatMathPlugin VMMaker-dtl.377 uuid: 80df7d73-9bc3-484e-a4ff-45e6d2e8d0dc " __DATE__ ; +static char __buildInfo[] = "FloatMathPlugin VMMaker-dtl.379 uuid: 08564677-5e9d-48d5-a63c-b53bd85489f3 " __DATE__ ; @@ -79,9 +79,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "FloatMathPlugin 27 February 2016 (i)" + "FloatMathPlugin 27 March 2016 (i)" #else - "FloatMathPlugin 27 February 2016 (e)" + "FloatMathPlugin 27 March 2016 (e)" #endif ; Modified: trunk/src/plugins/GeniePlugin/GeniePlugin.c =================================================================== --- trunk/src/plugins/GeniePlugin/GeniePlugin.c 2016-03-26 22:24:44 UTC (rev 3653) +++ trunk/src/plugins/GeniePlugin/GeniePlugin.c 2016-03-28 01:59:24 UTC (rev 3654) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.5 with VMMaker 4.15.3 translated as C source on 27 February 2016 5:19 pm */ +/* Smalltalk from Squeak4.5 with VMMaker 4.15.5 translated as C source on 27 March 2016 9:51:54 pm */ /* Automatically generated by - SmartSyntaxPluginCodeGenerator VMMaker-dtl.377 uuid: 80df7d73-9bc3-484e-a4ff-45e6d2e8d0dc + SmartSyntaxPluginCodeGenerator VMMaker-dtl.379 uuid: 08564677-5e9d-48d5-a63c-b53bd85489f3 from - GeniePlugin VMMaker-dtl.377 uuid: 80df7d73-9bc3-484e-a4ff-45e6d2e8d0dc + GeniePlugin VMMaker-dtl.379 uuid: 08564677-5e9d-48d5-a63c-b53bd85489f3 */ -static char __buildInfo[] = "GeniePlugin VMMaker-dtl.377 uuid: 80df7d73-9bc3-484e-a4ff-45e6d2e8d0dc " __DATE__ ; +static char __buildInfo[] = "GeniePlugin VMMaker-dtl.379 uuid: 08564677-5e9d-48d5-a63c-b53bd85489f3 " __DATE__ ; @@ -61,9 +61,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "GeniePlugin v2.0 27 February 2016 (i)" + "GeniePlugin v2.0 27 March 2016 (i)" #else - "GeniePlugin v2.0 27 February 2016 (e)" + "GeniePlugin v2.0 27 March 2016 (e)" #endif ; static sqInt simulator; Modified: trunk/src/plugins/HostWindowPlugin/HostWindowPlugin.c =================================================================== --- trunk/src/plugins/HostWindowPlugin/HostWindowPlugin.c 2016-03-26 22:24:44 UTC (rev 3653) +++ trunk/src/plugins/HostWindowPlugin/HostWindowPlugin.c 2016-03-28 01:59:24 UTC (rev 3654) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.5 with VMMaker 4.15.3 translated as C source on 27 February 2016 5:19:05 pm */ +/* Smalltalk from Squeak4.5 with VMMaker 4.15.5 translated as C source on 27 March 2016 9:51:59 pm */ /* Automatically generated by - SmartSyntaxPluginCodeGenerator VMMaker-dtl.377 uuid: 80df7d73-9bc3-484e-a4ff-45e6d2e8d0dc + SmartSyntaxPluginCodeGenerator VMMaker-dtl.379 uuid: 08564677-5e9d-48d5-a63c-b53bd85489f3 from - HostWindowPlugin VMMaker-dtl.377 uuid: 80df7d73-9bc3-484e-a4ff-45e6d2e8d0dc + HostWindowPlugin VMMaker-dtl.379 uuid: 08564677-5e9d-48d5-a63c-b53bd85489f3 */ -static char __buildInfo[] = "HostWindowPlugin VMMaker-dtl.377 uuid: 80df7d73-9bc3-484e-a4ff-45e6d2e8d0dc " __DATE__ ; +static char __buildInfo[] = "HostWindowPlugin VMMaker-dtl.379 uuid: 08564677-5e9d-48d5-a63c-b53bd85489f3 " __DATE__ ; @@ -66,9 +66,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "HostWindowPlugin 27 February 2016 (i)" + "HostWindowPlugin 27 March 2016 (i)" #else - "HostWindowPlugin 27 February 2016 (e)" + "HostWindowPlugin 27 March 2016 (e)" #endif ; static sqInt simulator; Modified: trunk/src/plugins/JPEGReadWriter2Plugin/JPEGReadWriter2Plugin.c =================================================================== --- trunk/src/plugins/JPEGReadWriter2Plugin/JPEGReadWriter2Plugin.c 2016-03-26 22:24:44 UTC (rev 3653) +++ trunk/src/plugins/JPEGReadWriter2Plugin/JPEGReadWriter2Plugin.c 2016-03-28 01:59:24 UTC (rev 3654) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.5 with VMMaker 4.15.3 translated as C source on 27 February 2016 5:19 pm */ +/* Smalltalk from Squeak4.5 with VMMaker 4.15.5 translated as C source on 27 March 2016 9:51:54 pm */ /* Automatically generated by - SmartSyntaxPluginCodeGenerator VMMaker-dtl.377 uuid: 80df7d73-9bc3-484e-a4ff-45e6d2e8d0dc + SmartSyntaxPluginCodeGenerator VMMaker-dtl.379 uuid: 08564677-5e9d-48d5-a63c-b53bd85489f3 from - JPEGReadWriter2Plugin VMMaker-dtl.377 uuid: 80df7d73-9bc3-484e-a4ff-45e6d2e8d0dc + JPEGReadWriter2Plugin VMMaker-dtl.379 uuid: 08564677-5e9d-48d5-a63c-b53bd85489f3 */ -static char __buildInfo[] = "JPEGReadWriter2Plugin VMMaker-dtl.377 uuid: 80df7d73-9bc3-484e-a4ff-45e6d2e8d0dc " __DATE__ ; +static char __buildInfo[] = "JPEGReadWriter2Plugin VMMaker-dtl.379 uuid: 08564677-5e9d-48d5-a63c-b53bd85489f3 " __DATE__ ; @@ -68,9 +68,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "JPEGReadWriter2Plugin 27 February 2016 (i)" + "JPEGReadWriter2Plugin 27 March 2016 (i)" #else - "JPEGReadWriter2Plugin 27 February 2016 (e)" + "JPEGReadWriter2Plugin 27 March 2016 (e)" #endif ; static sqInt simulator; Modified: trunk/src/plugins/JPEGReaderPlugin/JPEGReaderPlugin.c =================================================================== --- trunk/src/plugins/JPEGReaderPlugin/JPEGReaderPlugin.c 2016-03-26 22:24:44 UTC (rev 3653) +++ trunk/src/plugins/JPEGReaderPlugin/JPEGReaderPlugin.c 2016-03-28 01:59:24 UTC (rev 3654) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.5 with VMMaker 4.15.3 translated as C source on 27 February 2016 5:19 pm */ +/* Smalltalk from Squeak4.5 with VMMaker 4.15.5 translated as C source on 27 March 2016 9:51:54 pm */ /* Automatically generated by - VMPluginCodeGenerator VMMaker-dtl.377 uuid: 80df7d73-9bc3-484e-a4ff-45e6d2e8d0dc + VMPluginCodeGenerator VMMaker-dtl.379 uuid: 08564677-5e9d-48d5-a63c-b53bd85489f3 from - JPEGReaderPlugin VMMaker-dtl.377 uuid: 80df7d73-9bc3-484e-a4ff-45e6d2e8d0dc + JPEGReaderPlugin VMMaker-dtl.379 uuid: 08564677-5e9d-48d5-a63c-b53bd85489f3 */ -static char __buildInfo[] = "JPEGReaderPlugin VMMaker-dtl.377 uuid: 80df7d73-9bc3-484e-a4ff-45e6d2e8d0dc " __DATE__ ; +static char __buildInfo[] = "JPEGReaderPlugin VMMaker-dtl.379 uuid: 08564677-5e9d-48d5-a63c-b53bd85489f3 " __DATE__ ; @@ -136,9 +136,9 @@ static sqInt jsReadLimit; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "JPEGReaderPlugin 27 February 2016 (i)" + "JPEGReaderPlugin 27 March 2016 (i)" #else - "JPEGReaderPlugin 27 February 2016 (e)" + "JPEGReaderPlugin 27 March 2016 (e)" #endif ; static int *residuals; Modified: trunk/src/plugins/JoystickTabletPlugin/JoystickTabletPlugin.c =================================================================== --- trunk/src/plugins/JoystickTabletPlugin/JoystickTabletPlugin.c 2016-03-26 22:24:44 UTC (rev 3653) +++ trunk/src/plugins/JoystickTabletPlugin/JoystickTabletPlugin.c 2016-03-28 01:59:24 UTC (rev 3654) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.5 with VMMaker 4.15.3 translated as C source on 27 February 2016 5:19 pm */ +/* Smalltalk from Squeak4.5 with VMMaker 4.15.5 translated as C source on 27 March 2016 9:51:54 pm */ /* Automatically generated by - SmartSyntaxPluginCodeGenerator VMMaker-dtl.377 uuid: 80df7d73-9bc3-484e-a4ff-45e6d2e8d0dc + SmartSyntaxPluginCodeGenerator VMMaker-dtl.379 uuid: 08564677-5e9d-48d5-a63c-b53bd85489f3 from - JoystickTabletPlugin VMMaker-dtl.377 uuid: 80df7d73-9bc3-484e-a4ff-45e6d2e8d0dc + JoystickTabletPlugin VMMaker-dtl.379 uuid: 08564677-5e9d-48d5-a63c-b53bd85489f3 */ -static char __buildInfo[] = "JoystickTabletPlugin VMMaker-dtl.377 uuid: 80df7d73-9bc3-484e-a4ff-45e6d2e8d0dc " __DATE__ ; +static char __buildInfo[] = "JoystickTabletPlugin VMMaker-dtl.379 uuid: 08564677-5e9d-48d5-a63c-b53bd85489f3 " __DATE__ ; @@ -62,9 +62,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "JoystickTabletPlugin 27 February 2016 (i)" + "JoystickTabletPlugin 27 March 2016 (i)" #else - "JoystickTabletPlugin 27 February 2016 (e)" + "JoystickTabletPlugin 27 March 2016 (e)" #endif ; static sqInt simulator; Modified: trunk/src/plugins/KedamaPlugin2/KedamaPlugin2.c =================================================================== --- trunk/src/plugins/KedamaPlugin2/KedamaPlugin2.c 2016-03-26 22:24:44 UTC (rev 3653) +++ trunk/src/plugins/KedamaPlugin2/KedamaPlugin2.c 2016-03-28 01:59:24 UTC (rev 3654) @@ -1,6 +1,6 @@ -/* Smalltalk from Squeak4.5 with VMMaker 4.15.3 translated as C source on 27 February 2016 5:19:05 pm */ +/* Smalltalk from Squeak4.5 with VMMaker 4.15.5 translated as C source on 27 March 2016 9:51:59 pm */ /* Automatically generated by - VMPluginCodeGenerator VMMaker-dtl.377 uuid: 80df7d73-9bc3-484e-a4ff-45e6d2e8d0dc + VMPluginCodeGenerator VMMaker-dtl.379 uuid: 08564677-5e9d-48d5-a63c-b53bd85489f3 from KedamaPlugin2 Kedama-Plugins-yo.1 uuid: 3fc7d691-0149-ba4d-a339-5d27cd44a2f8 */ @@ -123,9 +123,9 @@ static unsigned int kedamaRandomSeed; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "KedamaPlugin2 27 February 2016 (i)" + "KedamaPlugin2 27 March 2016 (i)" #else - "KedamaPlugin2 27 February 2016 (e)" + "KedamaPlugin2 27 March 2016 (e)" #endif ; static unsigned int randA; Modified: trunk/src/plugins/Klatt/Klatt.c =================================================================== --- trunk/src/plugins/Klatt/Klatt.c 2016-03-26 22:24:44 UTC (rev 3653) +++ trunk/src/plugins/Klatt/Klatt.c 2016-03-28 01:59:24 UTC (rev 3654) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.5 with VMMaker 4.15.3 translated as C source on 27 February 2016 5:19 pm */ +/* Smalltalk from Squeak4.5 with VMMaker 4.15.5 translated as C source on 27 March 2016 9:51:54 pm */ /* Automatically generated by - VMPluginCodeGenerator VMMaker-dtl.377 uuid: 80df7d73-9bc3-484e-a4ff-45e6d2e8d0dc + VMPluginCodeGenerator VMMaker-dtl.379 uuid: 08564677-5e9d-48d5-a63c-b53bd85489f3 from - KlattSynthesizerPlugin VMMaker-dtl.377 uuid: 80df7d73-9bc3-484e-a4ff-45e6d2e8d0dc + KlattSynthesizerPlugin VMMaker-dtl.379 uuid: 08564677-5e9d-48d5-a63c-b53bd85489f3 */ -static char __buildInfo[] = "KlattSynthesizerPlugin VMMaker-dtl.377 uuid: 80df7d73-9bc3-484e-a4ff-45e6d2e8d0dc " __DATE__ ; +static char __buildInfo[] = "KlattSynthesizerPlugin VMMaker-dtl.379 uuid: 08564677-5e9d-48d5-a63c-b53bd85489f3 " __DATE__ ; @@ -155,9 +155,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "Klatt 27 February 2016 (i)" + "Klatt 27 March 2016 (i)" #else - "Klatt 27 February 2016 (e)" + "Klatt 27 March 2016 (e)" #endif ; static float nlast; Modified: trunk/src/plugins/LargeIntegers/LargeIntegers.c =================================================================== --- trunk/src/plugins/LargeIntegers/LargeIntegers.c 2016-03-26 22:24:44 UTC (rev 3653) +++ trunk/src/plugins/LargeIntegers/LargeIntegers.c 2016-03-28 01:59:24 UTC (rev 3654) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.5 with VMMaker 4.15.3 translated as C source on 27 February 2016 5:19:01 pm */ +/* Smalltalk from Squeak4.5 with VMMaker 4.15.5 translated as C source on 27 March 2016 9:51:55 pm */ /* Automatically generated by - SmartSyntaxPluginCodeGenerator VMMaker-dtl.377 uuid: 80df7d73-9bc3-484e-a4ff-45e6d2e8d0dc + SmartSyntaxPluginCodeGenerator VMMaker-dtl.379 uuid: 08564677-5e9d-48d5-a63c-b53bd85489f3 from - LargeIntegersPlugin VMMaker-dtl.377 uuid: 80df7d73-9bc3-484e-a4ff-45e6d2e8d0dc + LargeIntegersPlugin VMMaker-dtl.379 uuid: 08564677-5e9d-48d5-a63c-b53bd85489f3 */ -static char __buildInfo[] = "LargeIntegersPlugin VMMaker-dtl.377 uuid: 80df7d73-9bc3-484e-a4ff-45e6d2e8d0dc " __DATE__ ; +static char __buildInfo[] = "LargeIntegersPlugin VMMaker-dtl.379 uuid: 08564677-5e9d-48d5-a63c-b53bd85489f3 " __DATE__ ; @@ -41,24 +41,22 @@ /*** Constants ***/ /*** Function Prototypes ***/ -static sqInt anyBitOfBytesfromto(sqInt aBytesOop, sqInt start, sqInt stopArg); +static sqInt anyBitOfLargeIntfromto(sqInt aBytesOop, sqInt start, sqInt stopArg); static sqInt bytesgrowTo(sqInt aBytesObject, sqInt newLen); -static sqInt bytesOrIntgrowTo(sqInt oop, sqInt len); static sqInt cCopyIntValtoBytes(sqInt val, sqInt bytes); -static unsigned char cDigitAddlenwithleninto(unsigned char * pByteShort, sqInt shortLen, unsigned char * pByteLong, sqInt longLen, unsigned char * pByteRes); -static sqInt cDigitComparewithlen(unsigned char * pFirst, unsigned char * pSecond, sqInt len); -static int cDigitCopyFromtolen(unsigned char * pFrom, unsigned char * pTo, sqInt len); -static sqInt cDigitDivlenremlenquolen(unsigned char * pDiv, sqInt divLen, unsigned char * pRem, sqInt remLen, unsigned char * pQuo, sqInt quoLen); -static sqInt cDigitHighBitlen(unsigned char * pByte, sqInt len); +static unsigned char cDigitAddlenwithleninto(unsigned char *pByteShort, sqInt shortLen, unsigned char *pByteLong, sqInt longLen, unsigned char *pByteRes); +static sqInt cDigitComparewithlen(unsigned char *pFirst, unsigned char *pSecond, sqInt len); +static int cDigitCopyFromtolen(unsigned char *pFrom, unsigned char *pTo, sqInt len); +static sqInt cDigitDivlenremlenquolen(unsigned char *pDiv, sqInt divLen, unsigned char *pRem, sqInt remLen, unsigned char *pQuo, sqInt quoLen); +static sqInt cDigitHighBitlen(unsigned char *pByte, sqInt len); static sqInt cDigitLengthOfCSI(sqInt csi); -static sqInt cDigitLshiftfromlentolen(sqInt shiftCount, unsigned char * pFrom, sqInt lenFrom, unsigned char * pTo, sqInt lenTo); -static sqInt cDigitMontgomerylentimeslenmodulolenmInvModBinto(unsigned char * pBytesFirst, sqInt firstLen, unsigned char * pBytesSecond, sqInt secondLen, unsigned char * pBytesThird, sqInt thirdLen, sqInt mInv, unsigned char * pBytesRes); -static unsigned char cDigitMultiplylenwithleninto(unsigned char * pByteShort, sqInt shortLen, unsigned char * pByteLong, sqInt longLen, unsigned char * pByteRes); -static sqInt cDigitOfCSIat(sqInt csi, sqInt ix); -static sqInt cDigitOpshortlenlongleninto(sqInt opIndex, unsigned char * pByteShort, sqInt shortLen, unsigned char * pByteLong, sqInt longLen, unsigned char * pByteRes); -static int cDigitReplacefromtowithstartingAt(unsigned char * pTo, sqInt start, sqInt stop, unsigned char * pFrom, sqInt repStart); -static sqInt cDigitRshiftfromlentolen(sqInt shiftCount, unsigned char * pFrom, sqInt fromLen, unsigned char * pTo, sqInt toLen); -static sqInt cDigitSublenwithleninto(unsigned char * pByteSmall, sqInt smallLen, unsigned char * pByteLarge, sqInt largeLen, unsigned char * pByteRes); +static sqInt cDigitLshiftfromlentolen(sqInt shiftCount, unsigned char *pFrom, sqInt lenFrom, unsigned char *pTo, sqInt lenTo); +static sqInt cDigitMontgomerylentimeslenmodulolenmInvModBinto(unsigned char *pBytesFirst, sqInt firstLen, unsigned char *pBytesSecond, sqInt secondLen, unsigned char *pBytesThird, sqInt thirdLen, sqInt mInv, unsigned char *pBytesRes); +static unsigned char cDigitMultiplylenwithleninto(unsigned char *pByteShort, sqInt shortLen, unsigned char *pByteLong, sqInt longLen, unsigned char *pByteRes); +static sqInt cDigitOpshortlenlongleninto(sqInt opIndex, unsigned char *pByteShort, sqInt shortLen, unsigned char *pByteLong, sqInt longLen, unsigned char *pByteRes); +static int cDigitReplacefromtowithstartingAt(unsigned char *pTo, sqInt start, sqInt stop, unsigned char *pFrom, sqInt repStart); +static sqInt cDigitRshiftfromlentolen(sqInt shiftCount, unsigned char *pFrom, sqInt fromLen, unsigned char *pTo, sqInt toLen); +static sqInt cDigitSublenwithleninto(unsigned char *pByteSmall, sqInt smallLen, unsigned char *pByteLarge, sqInt largeLen, unsigned char *pByteRes); static sqInt cHighBit(unsigned int uint); static sqInt createLargeFromSmallInteger(sqInt anOop); static sqInt digitLshift(sqInt aBytesOop, sqInt shiftCount); @@ -70,12 +68,14 @@ static sqInt digitLength(sqInt oop); static sqInt digitMultiplyLargewithnegative(sqInt firstInteger, sqInt secondInteger, sqInt neg); static sqInt digitOfBytesat(sqInt aBytesOop, sqInt ix); +static sqInt digitOfLargeIntat(sqInt aBytesOop, sqInt ix); static sqInt digitSubLargewith(sqInt firstInteger, sqInt secondInteger); #pragma export on EXPORT(const char*) getModuleName(void); #pragma export off static sqInt halt(void); static sqInt isNormalized(sqInt anInteger); +static sqInt largeIntOrIntgrowTo(sqInt oop, sqInt len); static sqInt msg(char *s); static sqInt normalizeNegative(sqInt aLargeNegativeInteger); static sqInt normalizePositive(sqInt aLargePositiveInteger); @@ -101,6 +101,7 @@ EXPORT(sqInt) primDigitSubtract(void); EXPORT(sqInt) primDigitSubtractWith(void); EXPORT(sqInt) primGetModuleName(void); +EXPORT(sqInt) primMontgomeryDigitLength(void); EXPORT(sqInt) primMontgomeryTimesModulo(void); EXPORT(sqInt) primNormalize(void); EXPORT(sqInt) primNormalizeNegative(void); @@ -130,7 +131,7 @@ /* Argument has to be aBytesOop! */ /* Tests for any magnitude bits in the interval from start to stopArg. */ -static sqInt anyBitOfBytesfromto(sqInt aBytesOop, sqInt start, sqInt stopArg) { +static sqInt anyBitOfLargeIntfromto(sqInt aBytesOop, sqInt start, sqInt stopArg) { sqInt lastByteIx; sqInt digit; sqInt magnitude; @@ -140,7 +141,6 @@ sqInt stop; sqInt mask; sqInt ix; - unsigned char *pointer; /* missing DebugCode */; if ((start < 1) || (stopArg < 1)) { @@ -157,26 +157,26 @@ leftShift = 7 - ((stop - 1) % 8); if (firstByteIx == lastByteIx) { mask = (0xFF << rightShift) & (((usqInt) 0xFF) >> leftShift); - /* begin digitOfBytes:at: */ + /* begin digitOfLargeInt:at: */ if (firstByteIx > (interpreterProxy->slotSizeOf(magnitude))) { digit = 0; goto l1; } else { - digit = ((pointer = interpreterProxy->firstIndexableField(magnitude)))[firstByteIx - 1]; + digit = (((unsigned char *) (interpreterProxy->firstIndexableField(magnitude))))[firstByteIx - 1]; goto l1; } - l1: /* end digitOfBytes:at: */; + l1: /* end digitOfLargeInt:at: */; return (digit & mask) != 0; } - if ((((usqInt) (digitOfBytesat(magnitude, firstByteIx))) >> rightShift) != 0) { + if ((((usqInt) (digitOfLargeIntat(magnitude, firstByteIx))) >> rightShift) != 0) { return 1; } for (ix = (firstByteIx + 1); ix <= (lastByteIx - 1); ix += 1) { - if ((digitOfBytesat(magnitude, ix)) != 0) { + if ((digitOfLargeIntat(magnitude, ix)) != 0) { return 1; } } - if ((((digitOfBytesat(magnitude, lastByteIx)) << leftShift) & 0xFF) != 0) { + if ((((digitOfLargeIntat(magnitude, lastByteIx)) << leftShift) & 0xFF) != 0) { return 1; } return 0; @@ -204,37 +204,16 @@ return newBytes; } - -/* Attention: this method invalidates all oop's! Only newBytes is valid at return. */ - -static sqInt bytesOrIntgrowTo(sqInt oop, sqInt len) { - sqInt class; - sqInt val; - sqInt newBytes; - - if ((oop & 1)) { - val = (oop >> 1); - if (val < 0) { - class = interpreterProxy->classLargeNegativeInteger(); - } else { - class = interpreterProxy->classLargePositiveInteger(); - } - newBytes = interpreterProxy->instantiateClassindexableSize(class, len); - cCopyIntValtoBytes(val, newBytes); - } else { - newBytes = bytesgrowTo(oop, len); - } - return newBytes; -} - static sqInt cCopyIntValtoBytes(sqInt val, sqInt bytes) { - unsigned char * pByte; + unsigned char *pByte; sqInt ix; sqInt ixLimiT; pByte = interpreterProxy->firstIndexableField(bytes); for (ix = 1, ixLimiT = (cDigitLengthOfCSI(val)); ix <= ixLimiT; ix += 1) { - pByte[ix - 1] = (cDigitOfCSIat(val, ix)); + pByte[ix - 1] = ((((usqInt) ((val < 0 + ? 0 - val + : val))) >> ((ix - 1) * 8)) & 0xFF); } return null; } @@ -242,7 +221,7 @@ /* pByteRes len = longLen; returns over.. */ -static unsigned char cDigitAddlenwithleninto(unsigned char * pByteShort, sqInt shortLen, unsigned char * pByteLong, sqInt longLen, unsigned char * pByteRes) { +static unsigned char cDigitAddlenwithleninto(unsigned char *pByteShort, sqInt shortLen, unsigned char *pByteLong, sqInt longLen, unsigned char *pByteRes) { sqInt i; sqInt limit; unsigned int accum; @@ -264,7 +243,7 @@ /* Precondition: pFirst len = pSecond len. */ -static sqInt cDigitComparewithlen(unsigned char * pFirst, unsigned char * pSecond, sqInt len) { +static sqInt cDigitComparewithlen(unsigned char *pFirst, unsigned char *pSecond, sqInt len) { unsigned int firstDigit; unsigned int secondDigit; sqInt ix; @@ -283,7 +262,7 @@ return 0; } -static int cDigitCopyFromtolen(unsigned char * pFrom, unsigned char * pTo, sqInt len) { +static int cDigitCopyFromtolen(unsigned char *pFrom, unsigned char *pTo, sqInt len) { sqInt limit; sqInt i; @@ -295,7 +274,7 @@ return 0; } -static sqInt cDigitDivlenremlenquolen(unsigned char * pDiv, sqInt divLen, unsigned char * pRem, sqInt remLen, unsigned char * pQuo, sqInt quoLen) { +static sqInt cDigitDivlenremlenquolen(unsigned char *pDiv, sqInt divLen, unsigned char *pRem, sqInt remLen, unsigned char *pQuo, sqInt quoLen) { unsigned int b; unsigned int q; unsigned int a; @@ -368,13 +347,20 @@ /* i.e. (t,r3) < (hi,lo) */ q -= 1; - if (lo < dnh) { - hi -= 1; - lo = (lo + 256) - dnh; + if (hi == 0) { + + /* since hi is unsigned we must have this guard */ + + cond = 0; } else { - lo -= dnh; + if (lo < dnh) { + hi -= 1; + lo = (lo + 256) - dnh; + } else { + lo -= dnh; + } + cond = hi >= dh; } - cond = hi >= dh; } else { cond = 0; } @@ -423,7 +409,7 @@ LargeNegativeIntegers as well, since Squeak's LargeIntegers are sign/magnitude. */ -static sqInt cDigitHighBitlen(unsigned char * pByte, sqInt len) { +static sqInt cDigitHighBitlen(unsigned char *pByte, sqInt len) { unsigned int lastDigit; sqInt realLength; @@ -437,26 +423,70 @@ } -/* Answer the number of indexable fields of a CSmallInteger. This value is - the same as the largest legal subscript. */ +/* Answer the number of bytes required to represent the value of a CSmallInteger. */ static sqInt cDigitLengthOfCSI(sqInt csi) { - if ((csi < 256) && (csi > -256)) { + if (csi >= 0) { + if (csi < 256) { + return 1; + } + if (csi < 65536) { + return 2; + } + if (csi < 0x1000000) { + return 3; + } + if ((BYTES_PER_WORD) == 4) { + return 4; + } else { + if (csi < 0x100000000ULL) { + return 4; + } + if (csi < 0x10000000000ULL) { + return 5; + } + if (csi < 0x1000000000000ULL) { + return 6; + } + if (csi < 0x100000000000000ULL) { + return 7; + } + return 8; + } + } + if (csi > -256) { return 1; } - if ((csi < 65536) && (csi > -65536)) { + if (csi > -65536) { return 2; } - if ((csi < 0x1000000) && (csi > -16777216)) { + if (csi > -16777216) { return 3; } - return 4; + if ((BYTES_PER_WORD) == 4) { + return 4; + } else { + if (csi > -4294967296) { + return 4; + } + if (csi > -1099511627776) { + return 5; + } + if (csi > -281474976710656) { + return 6; + } + if (csi > -72057594037927936) { + return 7; + } + return 8; + } + return null; } /* C indexed! */ @@ Diff output truncated at 50000 characters. @@

1 0

VM Maker: VMMaker-dtl.379.mcz
by commits＠source.squeak.org 28 Mar '16

28 Mar '16

David T. Lewis uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker-dtl.379.mcz ==================== Summary ==================== Name: VMMaker-dtl.379 Author: dtl Time: 27 March 2016, 9:51:08.329 pm UUID: 08564677-5e9d-48d5-a63c-b53bd85489f3 Ancestors: VMMaker-dtl.378 VMMaker 4.15.5 Nicolas Cellier's LargeIntegersPlugin improvements from oscog branch. =============== Diff against VMMaker-dtl.378 =============== Item was added: + ----- Method: LargeIntegersPlugin>>anyBitOfLargeInt:from:to: (in category 'util') ----- + anyBitOfLargeInt: aBytesOop from: start to: stopArg + "Argument has to be aBytesOop!!" + "Tests for any magnitude bits in the interval from start to stopArg." + | magnitude rightShift leftShift stop firstByteIx lastByteIx | + self + debugCode: [self msg: 'anyBitOfLargeInt: aBytesOop from: start to: stopArg']. + start < 1 | (stopArg < 1) + ifTrue: [^ interpreterProxy primitiveFail]. + magnitude := aBytesOop. + stop := stopArg + min: (self highBitOfLargeInt: magnitude). + start > stop + ifTrue: [^ false]. + firstByteIx := start - 1 // 8 + 1. + lastByteIx := stop - 1 // 8 + 1. + rightShift := (start - 1 \\ 8). + leftShift := 7 - (stop - 1 \\ 8). + firstByteIx = lastByteIx + ifTrue: [| digit mask | + mask := (255 << rightShift) bitAnd: (255 >> leftShift). + digit := self digitOfLargeInt: magnitude at: firstByteIx. + ^ (digit bitAnd: mask) + ~= 0]. + ((self digitOfLargeInt: magnitude at: firstByteIx) + >> rightShift) + ~= 0 + ifTrue: [^ true]. + firstByteIx + 1 + to: lastByteIx - 1 + do: [:ix | (self digitOfLargeInt: magnitude at: ix) + ~= 0 + ifTrue: [^ true]]. + (((self digitOfLargeInt: magnitude at: lastByteIx) + << leftShift) + bitAnd: 255) + ~= 0 + ifTrue: [^ true]. + ^ false! Item was changed: ----- Method: LargeIntegersPlugin>>cCopyIntVal:toBytes: (in category 'C core util') ----- cCopyIntVal: val toBytes: bytes | pByte | + <var: #pByte type: #'unsigned char *'> - <var: #pByte type: 'unsigned char * '> pByte := interpreterProxy firstIndexableField: bytes. 1 to: (self cDigitLengthOfCSI: val) do: [:ix | pByte at: ix - 1 put: (self cDigitOfCSI: val at: ix)]! Item was changed: ----- Method: LargeIntegersPlugin>>cDigitAdd:len:with:len:into: (in category 'C core') ----- cDigitAdd: pByteShort len: shortLen with: pByteLong len: longLen into: pByteRes "pByteRes len = longLen; returns over.." | accum limit | + <returnTypeC: #'unsigned char'> + <var: #pByteShort type: #'unsigned char *'> + <var: #pByteLong type: #'unsigned char *'> + <var: #pByteRes type: #'unsigned char *'> + <var: #accum type: #'unsigned int'> - <returnTypeC: 'unsigned char'> - <var: #pByteShort type: 'unsigned char * '> - <var: #pByteLong type: 'unsigned char * '> - <var: #pByteRes type: 'unsigned char * '> - <var: #accum type: 'unsigned int'> accum := 0. limit := shortLen - 1. 0 to: limit do: [:i | accum := (accum >> 8) + (pByteShort at: i) + (pByteLong at: i). pByteRes at: i put: (accum bitAnd: 255)]. limit := longLen - 1. shortLen to: limit do: [:i | accum := (accum >> 8) + (pByteLong at: i). pByteRes at: i put: (accum bitAnd: 255)]. ^ accum >> 8! Item was changed: ----- Method: LargeIntegersPlugin>>cDigitCompare:with:len: (in category 'C core') ----- cDigitCompare: pFirst with: pSecond len: len "Precondition: pFirst len = pSecond len." | secondDigit ix firstDigit | + <var: #pFirst type: #'unsigned char *'> + <var: #pSecond type: #'unsigned char *'> + <var: #firstDigit type: #'unsigned int'> + <var: #secondDigit type: #'unsigned int'> - <var: #pFirst type: 'unsigned char * '> - <var: #pSecond type: 'unsigned char * '> - <var: #firstDigit type: 'unsigned int'> - <var: #secondDigit type: 'unsigned int'> ix := len - 1. [ix >= 0] whileTrue: [(secondDigit := pSecond at: ix) ~= (firstDigit := pFirst at: ix) ifTrue: [secondDigit < firstDigit ifTrue: [^ 1] ifFalse: [^ -1]]. ix := ix - 1]. ^ 0! Item was changed: ----- Method: LargeIntegersPlugin>>cDigitCopyFrom:to:len: (in category 'C core util') ----- cDigitCopyFrom: pFrom to: pTo len: len | limit | + <returnTypeC: #'int'> + <var: #pFrom type: #'unsigned char *'> + <var: #pTo type: #'unsigned char *'> - <returnTypeC: 'int'> - <var: #pFrom type: 'unsigned char * '> - <var: #pTo type: 'unsigned char * '> self cCode: '' inSmalltalk: [ (interpreterProxy isKindOf: InterpreterSimulator) ifTrue: [ "called from InterpreterSimulator" limit := len - 1. 0 to: limit do: [:i | interpreterProxy byteAt: pTo + i put: (interpreterProxy byteAt: pFrom + i) ]. ^ 0 ]. ]. limit := len - 1. 0 to: limit do: [:i | pTo at: i put: (pFrom at: i)]. ^ 0 ! Item was changed: ----- Method: LargeIntegersPlugin>>cDigitDiv:len:rem:len:quo:len: (in category 'C core') ----- cDigitDiv: pDiv len: divLen rem: pRem len: remLen quo: pQuo len: quoLen | dl ql dh dnh j t hi lo r3 l a cond q r1r2 mul b | + <var: #pDiv type: #'unsigned char *'> + <var: #pRem type: #'unsigned char *'> + <var: #pQuo type: #'unsigned char *'> + <var: #dh type: #'unsigned int'> + <var: #dnh type: #'unsigned int'> + <var: #r3 type: #'unsigned int'> + <var: #q type: #'unsigned int'> + <var: #a type: #'unsigned int'> + <var: #b type: #'unsigned int'> + <var: #t type: #'unsigned int'> + <var: #mul type: #'unsigned int'> + <var: #hi type: #'unsigned int'> + <var: #lo type: #'unsigned int'> + <var: #r1r2 type: #'unsigned int'> - <var: #pDiv type: 'unsigned char * '> - <var: #pRem type: 'unsigned char * '> - <var: #pQuo type: 'unsigned char * '> - <var: #dh type: 'unsigned int'> - <var: #dnh type: 'unsigned int'> - <var: #r3 type: 'unsigned int'> - <var: #q type: 'unsigned int'> - <var: #a type: 'unsigned int'> - <var: #b type: 'unsigned int'> - <var: #t type: 'unsigned int'> - <var: #mul type: 'unsigned int'> - <var: #hi type: 'unsigned int'> - <var: #lo type: 'unsigned int'> - <var: #r1r2 type: 'unsigned int'> dl := divLen - 1. "Last actual byte of data (ST ix)" ql := quoLen. dh := pDiv at: dl - 1. dl = 1 ifTrue: [dnh := 0] ifFalse: [dnh := pDiv at: dl - 2]. 1 to: ql do: [:k | "maintain quo*arg+rem=self" "Estimate rem/div by dividing the leading two digits of rem by dh." "The estimate is q = qhi*16r100+qlo, where qhi and qlo are unsigned char." j := remLen + 1 - k. "r1 := rem digitAt: j." (pRem at: j - 1) = dh ifTrue: [q := 16rFF] ifFalse: ["Compute q = (r1,r2)//dh, t = (r1,r2)\\dh." "r2 := (rem digitAt: j - 2)." r1r2 := pRem at: j - 1. r1r2 := (r1r2 << 8) + (pRem at: j - 2). t := r1r2 \\ dh. q := r1r2 // dh. "Next compute (hi,lo) := q*dnh" mul := q * dnh. hi := mul >> 8. lo := mul bitAnd: 16rFF. "Correct overestimate of q. Max of 2 iterations through loop -- see Knuth vol. 2" j < 3 ifTrue: [r3 := 0] ifFalse: [r3 := pRem at: j - 3]. [(t < hi or: [t = hi and: [r3 < lo]]) ifTrue: ["i.e. (t,r3) < (hi,lo)" q := q - 1. + hi = 0 "since hi is unsigned we must have this guard" + ifTrue: [cond := false] - lo < dnh - ifTrue: - [hi := hi - 1. - lo := lo + 16r100 - dnh] ifFalse: + [lo < dnh + ifTrue: + [hi := hi - 1. + lo := lo + 16r100 - dnh] + ifFalse: + [lo := lo - dnh]. + cond := hi >= dh]] - [lo := lo - dnh]. - cond := hi >= dh] ifFalse: [cond := false]. cond] whileTrue: [hi := hi - dh]]. "Subtract q*div from rem" l := j - dl. a := 0. 1 to: divLen do: [:i | hi := (pDiv at: i - 1) * (q >> 8). lo := (pDiv at: i - 1) * (q bitAnd: 16rFF). b := (pRem at: l - 1) - a - (lo bitAnd: 16rFF). pRem at: l - 1 put: (b bitAnd: 16rFF). "BEWARE: signed shift is implementation defined in C..." b := b signedBitShift: -8. "This is a possible replacement to simulate arithmetic shift (preserving sign of b)" "b := b >> 8 bitOr: (0 - (b >> ((interpreterProxy sizeof: b)*8""CHAR_BIT""-1)) << 8)." a := hi + (lo >> 8) - b. l := l + 1]. a > 0 ifTrue: ["Add div back into rem, decrease q by 1" q := q - 1. l := j - dl. a := 0. 1 to: divLen do: [:i | a := (a >> 8) + (pRem at: l - 1) + (pDiv at: i - 1). pRem at: l - 1 put: (a bitAnd: 16rFF). l := l + 1]]. pQuo at: quoLen - k put: q]. ^0! Item was changed: ----- Method: LargeIntegersPlugin>>cDigitHighBit:len: (in category 'C core util') ----- cDigitHighBit: pByte len: len "Answer the index (in bits) of the high order bit of the receiver, or zero if the receiver is zero. This method is allowed (and needed) for LargeNegativeIntegers as well, since Squeak's LargeIntegers are sign/magnitude." | realLength lastDigit | + <var: #pByte type: #'unsigned char *'> + <var: #lastDigit type: #'unsigned int'> - <var: #pByte type: 'unsigned char * '> - <var: #lastDigit type: 'unsigned int'> realLength := len. [(lastDigit := pByte at: realLength - 1) = 0] whileTrue: [(realLength := realLength - 1) = 0 ifTrue: [^ 0]]. ^ (self cHighBit: lastDigit) + (8 * (realLength - 1))! Item was changed: ----- Method: LargeIntegersPlugin>>cDigitLengthOfCSI: (in category 'C core util') ----- cDigitLengthOfCSI: csi + "Answer the number of bytes required to represent the value of a CSmallInteger." + csi >= 0 ifTrue: + [csi < 256 ifTrue: + [^1]. + csi < 65536 ifTrue: + [^2]. + csi < 16777216 ifTrue: + [^3]. + self bytesPerWord = 4 + ifTrue: + [^4] + ifFalse: + [csi < 4294967296 ifTrue: + [^4]. + csi < 1099511627776 ifTrue: + [^5]. + csi < 281474976710656 ifTrue: + [^6]. + csi < 72057594037927936 ifTrue: + [^7]. + ^8]]. + csi > -256 ifTrue: + [^1]. + csi > -65536 ifTrue: + [^2]. + csi > -16777216 ifTrue: + [^3]. + self bytesPerWord = 4 + ifTrue: + [^4] + ifFalse: + [csi > -4294967296 ifTrue: + [^4]. + csi > -1099511627776 ifTrue: + [^5]. + csi > -281474976710656 ifTrue: + [^6]. + csi > -72057594037927936 ifTrue: + [^7]. + ^8]! - "Answer the number of indexable fields of a CSmallInteger. This value is - the same as the largest legal subscript." - (csi < 256 and: [csi > -256]) - ifTrue: [^ 1]. - (csi < 65536 and: [csi > -65536]) - ifTrue: [^ 2]. - (csi < 16777216 and: [csi > -16777216]) - ifTrue: [^ 3]. - ^ 4! Item was changed: ----- Method: LargeIntegersPlugin>>cDigitLshift:from:len:to:len: (in category 'C core') ----- cDigitLshift: shiftCount from: pFrom len: lenFrom to: pTo len: lenTo "C indexed!!" | digitShift bitShift carry limit digit rshift | + <var: #pTo type: #'unsigned char *'> + <var: #pFrom type: #'unsigned char *'> + <var: #carry type: #'unsigned int'> + <var: #digit type: #'unsigned int'> - <var: #pTo type: 'unsigned char * '> - <var: #pFrom type: 'unsigned char * '> - <var: #carry type: 'unsigned int'> - <var: #digit type: 'unsigned int'> digitShift := shiftCount // 8. bitShift := shiftCount \\ 8. limit := digitShift - 1. 0 to: limit do: [:i | pTo at: i put: 0]. bitShift = 0 ifTrue: ["Fast version for digit-aligned shifts" "C indexed!!" ^ self cDigitReplace: pTo from: digitShift to: lenTo - 1 with: pFrom startingAt: 0]. "This implementation use at most 15 bits of carry. bitAnd: 16rFF is only for simulator, useless in C" rshift := 8 - bitShift. carry := 0. limit := lenFrom - 1. 0 to: limit do: [:i | digit := pFrom at: i. pTo at: i + digitShift put: ((carry bitOr: digit << bitShift) bitAnd: 16rFF). carry := digit >> rshift]. carry = 0 ifFalse: [pTo at: lenTo - 1 put: carry]. ^0 ! Item was changed: ----- Method: LargeIntegersPlugin>>cDigitMontgomery:len:times:len:modulo:len:mInvModB:into: (in category 'C core') ----- cDigitMontgomery: pBytesFirst len: firstLen times: pBytesSecond len: secondLen modulo: pBytesThird len: thirdLen mInvModB: mInv into: pBytesRes | u limit1 limit2 limit3 accum lastByte | + <var: #pBytesFirst type: #'unsigned char *'> + <var: #pBytesSecond type: #'unsigned char *'> + <var: #pBytesThird type: #'unsigned char *'> + <var: #pBytesRes type: #'unsigned char *'> + <var: #accum type: #'unsigned int'> + <var: #u type: #'unsigned char'> + <var: #lastByte type: #'unsigned char'> - <var: #pBytesFirst type: 'unsigned char * '> - <var: #pBytesSecond type: 'unsigned char * '> - <var: #pBytesThird type: 'unsigned char * '> - <var: #pBytesRes type: 'unsigned char * '> - <var: #accum type: 'usqInt '> - <var: #u type: 'unsigned char '> - <var: #lastByte type: 'unsigned char '> limit1 := firstLen - 1. limit2 := secondLen - 1. limit3 := thirdLen - 1. lastByte := 0. 0 to: limit1 do: [:i | accum := (pBytesRes at: 0) + ((pBytesFirst at: i)*(pBytesSecond at: 0)). u := accum * mInv bitAnd: 255. accum := accum + (u * (pBytesThird at: 0)). 1 to: limit2 do: [:k | accum := (accum >> 8) + (pBytesRes at: k) + ((pBytesFirst at: i)*(pBytesSecond at: k)) + (u * (pBytesThird at: k)). pBytesRes at: k-1 put: (accum bitAnd: 255)]. secondLen to: limit3 do: [:k | accum := (accum >> 8) + (pBytesRes at: k) + (u * (pBytesThird at: k)). pBytesRes at: k-1 put: (accum bitAnd: 255)]. accum := (accum >> 8) + lastByte. pBytesRes at: limit3 put: (accum bitAnd: 255). lastByte := accum >> 8]. firstLen to: limit3 do: [:i | accum := (pBytesRes at: 0). u := accum * mInv bitAnd: 255. accum := accum + (u * (pBytesThird at: 0)). 1 to: limit3 do: [:k | accum := (accum >> 8) + (pBytesRes at: k) + (u * (pBytesThird at: k)). pBytesRes at: k-1 put: (accum bitAnd: 255)]. accum := (accum >> 8) + lastByte. pBytesRes at: limit3 put: (accum bitAnd: 255). lastByte := accum >> 8]. (lastByte = 0 and: [(self cDigitCompare: pBytesThird with: pBytesRes len: thirdLen) = 1]) ifFalse: [ "self cDigitSub: pBytesThird len: thirdLen with: pBytesRes len: thirdLen into: pBytesRes" accum := 0. 0 to: limit3 do: [:i | accum := accum + (pBytesRes at: i) - (pBytesThird at: i). + pBytesRes at: i put: (self cCode: [accum] inSmalltalk: [accum bitAnd: 255]). - pBytesRes at: i put: (accum bitAnd: 255). accum := accum signedBitShift: -8]].! Item was changed: ----- Method: LargeIntegersPlugin>>cDigitMultiply:len:with:len:into: (in category 'C core') ----- cDigitMultiply: pByteShort len: shortLen with: pByteLong len: longLen into: pByteRes | limitLong digit k carry limitShort ab | + <returnTypeC: #'unsigned char'> + <var: #pByteShort type: #'unsigned char *'> + <var: #pByteLong type: #'unsigned char *'> + <var: #pByteRes type: #'unsigned char *'> + <var: #digit type: #'unsigned int'> + <var: #carry type: #'unsigned int'> + <var: #ab type: #'unsigned int'> - <returnTypeC: 'unsigned char'> - <var: #pByteShort type: 'unsigned char * '> - <var: #pByteLong type: 'unsigned char * '> - <var: #pByteRes type: 'unsigned char * '> - <var: #digit type: 'unsigned int'> - <var: #carry type: 'unsigned int'> - <var: #ab type: 'unsigned int'> (shortLen = 1 and: [(pByteShort at: 0) = 0]) ifTrue: [^ 0]. (longLen = 1 and: [(pByteLong at: 0) = 0]) ifTrue: [^ 0]. "prod starts out all zero" limitShort := shortLen - 1. limitLong := longLen - 1. 0 to: limitShort do: [:i | (digit := pByteShort at: i) ~= 0 ifTrue: [k := i. carry := 0. "Loop invariant: 0<=carry<=0377, k=i+j-1 (ST)" "-> Loop invariant: 0<=carry<=0377, k=i+j (C) (?)" 0 to: limitLong do: [:j | ab := (pByteLong at: j). ab := ab * digit + carry + (pByteRes at: k). carry := ab >> 8. pByteRes at: k put: (ab bitAnd: 16rFF). k := k + 1]. pByteRes at: k put: carry]]. ^ 0! Item was changed: ----- Method: LargeIntegersPlugin>>cDigitOfCSI:at: (in category 'C core util') ----- cDigitOfCSI: csi at: ix "Answer the value of an indexable field in the receiver. LargePositiveInteger uses bytes of base two number, and each is a 'digit' base 256." "ST indexed!!" + ^self + cCode: [(csi < 0 + ifTrue: [0 - csi] + ifFalse: [csi]) >> (ix - 1 * 8) bitAnd: 255] + inSmalltalk: [csi digitAt: ix]! - ix < 1 ifTrue: [interpreterProxy primitiveFail]. - ix > 4 ifTrue: [^ 0]. - csi < 0 - ifTrue: - [self cCode: '' - inSmalltalk: [csi = -1073741824 ifTrue: ["SmallInteger minVal" - "Can't negate minVal -- treat specially" - ^ #(0 0 0 64 ) at: ix]]. - ^ (0 - csi) >> (ix - 1 * 8) - bitAnd: 255] - ifFalse: [^ csi >> (ix - 1 * 8) - bitAnd: 255]! Item was changed: ----- Method: LargeIntegersPlugin>>cDigitOp:short:len:long:len:into: (in category 'C core') ----- cDigitOp: opIndex short: pByteShort len: shortLen long: pByteLong len: longLen into: pByteRes "pByteRes len = longLen." | limit | + <var: #pByteShort type: #'unsigned char *'> + <var: #pByteLong type: #'unsigned char *'> + <var: #pByteRes type: #'unsigned char *'> - <var: #pByteShort type: 'unsigned char * '> - <var: #pByteLong type: 'unsigned char * '> - <var: #pByteRes type: 'unsigned char * '> limit := shortLen - 1. opIndex = andOpIndex ifTrue: [0 to: limit do: [:i | pByteRes at: i put: ((pByteShort at: i) bitAnd: (pByteLong at: i))]. limit := longLen - 1. shortLen to: limit do: [:i | pByteRes at: i put: 0]. ^ 0]. opIndex = orOpIndex ifTrue: [0 to: limit do: [:i | pByteRes at: i put: ((pByteShort at: i) bitOr: (pByteLong at: i))]. limit := longLen - 1. shortLen to: limit do: [:i | pByteRes at: i put: (pByteLong at: i)]. ^ 0]. opIndex = xorOpIndex ifTrue: [0 to: limit do: [:i | pByteRes at: i put: ((pByteShort at: i) bitXor: (pByteLong at: i))]. limit := longLen - 1. shortLen to: limit do: [:i | pByteRes at: i put: (pByteLong at: i)]. ^ 0]. ^ interpreterProxy primitiveFail! Item was changed: ----- Method: LargeIntegersPlugin>>cDigitReplace:from:to:with:startingAt: (in category 'C core util') ----- cDigitReplace: pTo from: start to: stop with: pFrom startingAt: repStart "C indexed!!" + <returnTypeC: #'int'> + <var: #pTo type: #'unsigned char *'> + <var: #pFrom type: #'unsigned char *'> - <returnTypeC: 'int'> - <var: #pTo type: 'unsigned char * '> - <var: #pFrom type: 'unsigned char * '> ^ self cDigitCopyFrom: pFrom + repStart to: pTo + start len: stop - start + 1! Item was changed: ----- Method: LargeIntegersPlugin>>cDigitRshift:from:len:to:len: (in category 'C core') ----- cDigitRshift: shiftCount from: pFrom len: fromLen to: pTo len: toLen | digit bitShift carry digitShift leftShift limit start | + <var: #pTo type: #'unsigned char *'> + <var: #pFrom type: #'unsigned char *'> + <var: #carry type: #'unsigned int'> + <var: #digit type: #'unsigned int'> - <var: #pTo type: 'unsigned char * '> - <var: #pFrom type: 'unsigned char * '> - <var: #carry type: 'unsigned int '> - <var: #digit type: 'unsigned int '> digitShift := shiftCount // 8. bitShift := shiftCount \\ 8. bitShift = 0 ifTrue: ["Fast version for byte-aligned shifts" "C indexed!!" ^self cDigitReplace: pTo from: 0 to: toLen - 1 with: pFrom startingAt: digitShift]. "This implementation use at most 16 bits of x" leftShift := 8 - bitShift. carry := (pFrom at: digitShift) >> bitShift. start := digitShift + 1. limit := fromLen - 1. start to: limit do: [:j | digit := pFrom at: j. pTo at: j - start put: ((carry bitOr: digit << leftShift) bitAnd: 16rFF). carry := digit >> bitShift]. carry = 0 ifFalse: [pTo at: toLen - 1 put: carry]. ^0! Item was changed: ----- Method: LargeIntegersPlugin>>cDigitSub:len:with:len:into: (in category 'C core') ----- cDigitSub: pByteSmall len: smallLen with: pByteLarge len: largeLen into: pByteRes | z | + <var: #pByteSmall type: #'unsigned char *'> + <var: #pByteLarge type: #'unsigned char *'> + <var: #pByteRes type: #'unsigned char *'> - <var: #pByteSmall type: 'unsigned char * '> - <var: #pByteLarge type: 'unsigned char * '> - <var: #pByteRes type: 'unsigned char * '> - <var: #z type: 'unsigned int'> + z := 0. "Loop invariant is -1<=z<=1" - z := 0. "Loop invariant is -1<=z<=0" 0 to: smallLen - 1 do: [:i | z := z + (pByteLarge at: i) - (pByteSmall at: i). + pByteRes at: i put: (self cCode: [z] inSmalltalk: [z bitAnd: 255]). - pByteRes at: i put: (z bitAnd: 16rFF). z := z signedBitShift: -8]. smallLen to: largeLen - 1 do: [:i | z := z + (pByteLarge at: i) . + pByteRes at: i put: (self cCode: [z] inSmalltalk: [z bitAnd: 255]). - pByteRes at: i put: (z bitAnd: 16rFF). z := z signedBitShift: -8]. ! Item was changed: ----- Method: LargeIntegersPlugin>>cHighBit: (in category 'C core util') ----- cHighBit: uint "Answer the index of the high order bit of the argument, or zero if the argument is zero." "For 64 bit uints there could be added a 32-shift." | shifted bitNo | + <var: #uint type: #'unsigned int'> + <var: #shifted type: #'unsigned int'> - <var: #uint type: 'unsigned int'> - <var: #shifted type: 'unsigned int '> shifted := uint. bitNo := 0. shifted < (1 << 16) ifFalse: [shifted := shifted bitShift: -16. bitNo := bitNo + 16]. shifted < (1 << 8) ifFalse: [shifted := shifted bitShift: -8. bitNo := bitNo + 8]. shifted < (1 << 4) ifFalse: [shifted := shifted bitShift: -4. bitNo := bitNo + 4]. shifted < (1 << 2) ifFalse: [shifted := shifted bitShift: -2. bitNo := bitNo + 2]. shifted < (1 << 1) ifFalse: [shifted := shifted bitShift: -1. bitNo := bitNo + 1]. "shifted 0 or 1 now" ^ bitNo + shifted! Item was changed: ----- Method: LargeIntegersPlugin>>createLargeFromSmallInteger: (in category 'oop util') ----- createLargeFromSmallInteger: anOop "anOop has to be a SmallInteger!!" + | val class size res pByte byte | + <var: #pByte type: #'unsigned char *'> - | val class size res pByte | - <var: #pByte type: 'unsigned char * '> val := interpreterProxy integerValueOf: anOop. val < 0 ifTrue: [class := interpreterProxy classLargeNegativeInteger] ifFalse: [class := interpreterProxy classLargePositiveInteger]. size := self cDigitLengthOfCSI: val. res := interpreterProxy instantiateClass: class indexableSize: size. pByte := interpreterProxy firstIndexableField: res. + 1 to: size do: [:ix | + byte := self cDigitOfCSI: val at: ix. + pByte at: ix - 1 put: byte]. + ^res! - 1 to: size do: [:ix | pByte at: ix - 1 put: (self cDigitOfCSI: val at: ix)]. - ^ res! Item was changed: ----- Method: LargeIntegersPlugin>>digit:Lshift: (in category 'oop functions') ----- digit: aBytesOop Lshift: shiftCount "Attention: this method invalidates all oop's!! Only newBytes is valid at return." "Does not normalize." | newBytes highBit newLen oldLen | + oldLen := self digitSizeOfLargeInt: aBytesOop. - oldLen := self byteSizeOfBytes: aBytesOop. (highBit := self cDigitHighBit: (interpreterProxy firstIndexableField: aBytesOop) len: oldLen) = 0 ifTrue: [^ 0 asOop: SmallInteger]. newLen := highBit + shiftCount + 7 // 8. self remapOop: aBytesOop in: [newBytes := interpreterProxy instantiateClass: (interpreterProxy fetchClassOf: aBytesOop) indexableSize: newLen]. self cDigitLshift: shiftCount from: (interpreterProxy firstIndexableField: aBytesOop) len: oldLen to: (interpreterProxy firstIndexableField: newBytes) len: newLen. ^ newBytes! Item was changed: ----- Method: LargeIntegersPlugin>>digitAddLarge:with: (in category 'oop functions') ----- digitAddLarge: firstInteger with: secondInteger "Does not need to normalize!!" | over firstLen secondLen shortInt shortLen longInt longLen sum newSum resClass | + <var: #over type: #'unsigned char'> + firstLen := self digitSizeOfLargeInt: firstInteger. + secondLen := self digitSizeOfLargeInt: secondInteger. - <var: #over type: 'unsigned char '> - firstLen := self byteSizeOfBytes: firstInteger. - secondLen := self byteSizeOfBytes: secondInteger. resClass := interpreterProxy fetchClassOf: firstInteger. firstLen <= secondLen ifTrue: [shortInt := firstInteger. shortLen := firstLen. longInt := secondInteger. longLen := secondLen] ifFalse: [shortInt := secondInteger. shortLen := secondLen. longInt := firstInteger. longLen := firstLen]. " sum := Integer new: len neg: firstInteger negative." self remapOop: #(shortInt longInt ) in: [sum := interpreterProxy instantiateClass: resClass indexableSize: longLen]. over := self cDigitAdd: (interpreterProxy firstIndexableField: shortInt) len: shortLen with: (interpreterProxy firstIndexableField: longInt) len: longLen into: (interpreterProxy firstIndexableField: sum). over > 0 ifTrue: ["sum := sum growby: 1." self remapOop: sum in: [newSum := interpreterProxy instantiateClass: resClass indexableSize: longLen + 1]. self cDigitCopyFrom: (interpreterProxy firstIndexableField: sum) to: (interpreterProxy firstIndexableField: newSum) len: longLen. sum := newSum. "C index!!" (self cCoerce: (interpreterProxy firstIndexableField: sum) to: 'unsigned char *') at: longLen put: over]. ^ sum! Item was changed: ----- Method: LargeIntegersPlugin>>digitBitLogic:with:opIndex: (in category 'oop functions') ----- digitBitLogic: firstInteger with: secondInteger opIndex: opIx "Bit logic here is only implemented for positive integers or Zero; if rec or arg is negative, it fails." | firstLarge secondLarge firstLen secondLen shortLen shortLarge longLen longLarge result | (interpreterProxy isIntegerObject: firstInteger) ifTrue: [(interpreterProxy integerValueOf: firstInteger) < 0 ifTrue: [^ interpreterProxy primitiveFail]. "convert it to a not normalized LargeInteger" self remapOop: secondInteger in: [firstLarge := self createLargeFromSmallInteger: firstInteger]] ifFalse: [(interpreterProxy fetchClassOf: firstInteger) = interpreterProxy classLargeNegativeInteger ifTrue: [^ interpreterProxy primitiveFail]. firstLarge := firstInteger]. (interpreterProxy isIntegerObject: secondInteger) ifTrue: [(interpreterProxy integerValueOf: secondInteger) < 0 ifTrue: [^ interpreterProxy primitiveFail]. "convert it to a not normalized LargeInteger" self remapOop: firstLarge in: [secondLarge := self createLargeFromSmallInteger: secondInteger]] ifFalse: [(interpreterProxy fetchClassOf: secondInteger) = interpreterProxy classLargeNegativeInteger ifTrue: [^ interpreterProxy primitiveFail]. secondLarge := secondInteger]. + firstLen := self digitSizeOfLargeInt: firstLarge. + secondLen := self digitSizeOfLargeInt: secondLarge. - firstLen := self byteSizeOfBytes: firstLarge. - secondLen := self byteSizeOfBytes: secondLarge. firstLen < secondLen ifTrue: [shortLen := firstLen. shortLarge := firstLarge. longLen := secondLen. longLarge := secondLarge] ifFalse: [shortLen := secondLen. shortLarge := secondLarge. longLen := firstLen. longLarge := firstLarge]. self remapOop: #(shortLarge longLarge ) in: [result := interpreterProxy instantiateClass: interpreterProxy classLargePositiveInteger indexableSize: longLen]. self cDigitOp: opIx short: (interpreterProxy firstIndexableField: shortLarge) len: shortLen long: (interpreterProxy firstIndexableField: longLarge) len: longLen into: (interpreterProxy firstIndexableField: result). interpreterProxy failed ifTrue: [^ 0]. ^ self normalizePositive: result! Item was changed: ----- Method: LargeIntegersPlugin>>digitCompareLarge:with: (in category 'oop functions') ----- digitCompareLarge: firstInteger with: secondInteger "Compare the magnitude of firstInteger with that of secondInteger. Return a code of 1, 0, -1 for firstInteger >, = , < secondInteger" | firstLen secondLen | + firstLen := self digitSizeOfLargeInt: firstInteger. + secondLen := self digitSizeOfLargeInt: secondInteger. - firstLen := self byteSizeOfBytes: firstInteger. - secondLen := self byteSizeOfBytes: secondInteger. secondLen ~= firstLen ifTrue: [secondLen > firstLen ifTrue: [^ -1 asOop: SmallInteger] ifFalse: [^ 1 asOop: SmallInteger]]. ^ (self cDigitCompare: (interpreterProxy firstIndexableField: firstInteger) with: (interpreterProxy firstIndexableField: secondInteger) len: firstLen) asOop: SmallInteger! Item was changed: ----- Method: LargeIntegersPlugin>>digitDivLarge:with:negative: (in category 'oop functions') ----- digitDivLarge: firstInteger with: secondInteger negative: neg "Does not normalize." "Division by zero has to be checked in caller." | firstLen secondLen resultClass l d div rem quo result | + firstLen := self digitSizeOfLargeInt: firstInteger. + secondLen := self digitSizeOfLargeInt: secondInteger. - firstLen := self byteSizeOfBytes: firstInteger. - secondLen := self byteSizeOfBytes: secondInteger. neg ifTrue: [resultClass := interpreterProxy classLargeNegativeInteger] ifFalse: [resultClass := interpreterProxy classLargePositiveInteger]. l := firstLen - secondLen + 1. l <= 0 ifTrue: [self remapOop: firstInteger in: [result := interpreterProxy instantiateClass: interpreterProxy classArray indexableSize: 2]. result stAt: 1 put: (0 asOop: SmallInteger). result stAt: 2 put: firstInteger. ^ result]. "set rem and div to copies of firstInteger and secondInteger, respectively. However, to facilitate use of Knuth's algorithm, multiply rem and div by 2 (that is, shift) until the high byte of div is >=128" + d := 8 - (self cHighBit: (self unsafeDigitOf: secondInteger at: secondLen)). - d := 8 - (self cHighBit: (self unsafeByteOf: secondInteger at: secondLen)). self remapOop: firstInteger in: [div := self digit: secondInteger Lshift: d. + div := self largeIntOrInt: div growTo: (self digitLength: div) - div := self bytesOrInt: div growTo: (self digitLength: div) + 1]. self remapOop: div in: [rem := self digit: firstInteger Lshift: d. (self digitLength: rem) + = firstLen ifTrue: [rem := self largeIntOrInt: rem growTo: firstLen + 1]]. - = firstLen ifTrue: [rem := self bytesOrInt: rem growTo: firstLen + 1]]. self remapOop: #(div rem ) in: [quo := interpreterProxy instantiateClass: resultClass indexableSize: l]. self cDigitDiv: (interpreterProxy firstIndexableField: div) len: (self digitLength: div) rem: (interpreterProxy firstIndexableField: rem) len: (self digitLength: rem) quo: (interpreterProxy firstIndexableField: quo) len: (self digitLength: quo). self remapOop: #(quo ) in: [rem := self digit: rem Rshift: d lookfirst: (self digitLength: div) - 1]. "^ Array with: quo with: rem" self remapOop: #(quo rem ) in: [result := interpreterProxy instantiateClass: interpreterProxy classArray indexableSize: 2]. result stAt: 1 put: quo. result stAt: 2 put: rem. ^ result! Item was changed: ----- Method: LargeIntegersPlugin>>digitLength: (in category 'util') ----- digitLength: oop (interpreterProxy isIntegerObject: oop) ifTrue: [^ self cDigitLengthOfCSI: (interpreterProxy integerValueOf: oop)] + ifFalse: [^ self digitSizeOfLargeInt: oop]! - ifFalse: [^ self byteSizeOfBytes: oop]! Item was added: + ----- Method: LargeIntegersPlugin>>digitLengthOfNonImmediate: (in category 'util') ----- + digitLengthOfNonImmediate: oop + <inline: true> + ^self digitSizeOfLargeInt: oop! Item was changed: ----- Method: LargeIntegersPlugin>>digitMontgomery:times:modulo:mInvModB: (in category 'oop functions') ----- digitMontgomery: firstLarge times: secondLarge modulo: thirdLarge mInvModB: mInv | firstLen secondLen thirdLen prod | + firstLen := self digitSizeOfLargeInt: firstLarge. + secondLen := self digitSizeOfLargeInt: secondLarge. + thirdLen := self digitSizeOfLargeInt: thirdLarge. - firstLen := self byteSizeOfBytes: firstLarge. - secondLen := self byteSizeOfBytes: secondLarge. - thirdLen := self byteSizeOfBytes: thirdLarge. firstLen <= thirdLen ifFalse: [^interpreterProxy primitiveFail]. secondLen <= thirdLen ifFalse: [^interpreterProxy primitiveFail]. (mInv >= 0 and: [mInv <= 255]) ifFalse: [^interpreterProxy primitiveFail]. self remapOop: #(firstLarge secondLarge thirdLarge) in: [prod := interpreterProxy instantiateClass: interpreterProxy classLargePositiveInteger indexableSize: thirdLen]. self cDigitMontgomery: (interpreterProxy firstIndexableField: firstLarge) len: firstLen times: (interpreterProxy firstIndexableField: secondLarge) len: secondLen modulo: (interpreterProxy firstIndexableField: thirdLarge) len: thirdLen mInvModB: mInv into: (interpreterProxy firstIndexableField: prod). ^self normalizePositive: prod! Item was changed: ----- Method: LargeIntegersPlugin>>digitMultiplyLarge:with:negative: (in category 'oop functions') ----- digitMultiplyLarge: firstInteger with: secondInteger negative: neg "Normalizes." | firstLen secondLen shortInt shortLen longInt longLen prod resultClass | + firstLen := self digitSizeOfLargeInt: firstInteger. + secondLen := self digitSizeOfLargeInt: secondInteger. - firstLen := self byteSizeOfBytes: firstInteger. - secondLen := self byteSizeOfBytes: secondInteger. firstLen <= secondLen ifTrue: [shortInt := firstInteger. shortLen := firstLen. longInt := secondInteger. longLen := secondLen] ifFalse: [shortInt := secondInteger. shortLen := secondLen. longInt := firstInteger. longLen := firstLen]. neg ifTrue: [resultClass := interpreterProxy classLargeNegativeInteger] ifFalse: [resultClass := interpreterProxy classLargePositiveInteger]. self remapOop: #(shortInt longInt ) in: [prod := interpreterProxy instantiateClass: resultClass indexableSize: longLen + shortLen]. self cDigitMultiply: (interpreterProxy firstIndexableField: shortInt) len: shortLen with: (interpreterProxy firstIndexableField: longInt) len: longLen into: (interpreterProxy firstIndexableField: prod). ^ self normalize: prod! Item was added: + ----- Method: LargeIntegersPlugin>>digitOfLargeInt:at: (in category 'util') ----- + digitOfLargeInt: aBytesOop at: ix + "Argument has to be aLargeInteger!!" + ix > (self digitSizeOfLargeInt: aBytesOop) + ifTrue: [^ 0] + ifFalse: [^ self unsafeDigitOf: aBytesOop at: ix]! Item was added: + ----- Method: LargeIntegersPlugin>>digitSizeOfLargeInt: (in category 'util') ----- + digitSizeOfLargeInt: bytesOop + "Precondition: bytesOop is not anInteger and a bytes object." + ^ interpreterProxy slotSizeOf: bytesOop! Item was changed: ----- Method: LargeIntegersPlugin>>digitSubLarge:with: (in category 'oop functions') ----- digitSubLarge: firstInteger with: secondInteger "Normalizes." | firstLen secondLen larger largerLen smaller smallerLen neg resLen res firstNeg | firstNeg := (interpreterProxy fetchClassOf: firstInteger) = interpreterProxy classLargeNegativeInteger. + firstLen := self digitSizeOfLargeInt: firstInteger. + secondLen := self digitSizeOfLargeInt: secondInteger. - firstLen := self byteSizeOfBytes: firstInteger. - secondLen := self byteSizeOfBytes: secondInteger. firstLen = secondLen ifTrue: [[firstLen > 1 + and: [(self digitOfLargeInt: firstInteger at: firstLen) = (self digitOfLargeInt: secondInteger at: firstLen)]] - and: [(self digitOfBytes: firstInteger at: firstLen) = (self digitOfBytes: secondInteger at: firstLen)]] whileTrue: [firstLen := firstLen - 1]. secondLen := firstLen]. (firstLen < secondLen or: [firstLen = secondLen + and: [(self digitOfLargeInt: firstInteger at: firstLen) < (self digitOfLargeInt: secondInteger at: firstLen)]]) - and: [(self digitOfBytes: firstInteger at: firstLen) < (self digitOfBytes: secondInteger at: firstLen)]]) ifTrue: [larger := secondInteger. largerLen := secondLen. smaller := firstInteger. smallerLen := firstLen. neg := firstNeg == false] ifFalse: [larger := firstInteger. largerLen := firstLen. smaller := secondInteger. smallerLen := secondLen. neg := firstNeg]. resLen := largerLen. self remapOop: #(smaller larger) in: [res := interpreterProxy instantiateClass: (neg ifTrue: [interpreterProxy classLargeNegativeInteger] ifFalse: [interpreterProxy classLargePositiveInteger]) indexableSize: resLen]. self cDigitSub: (interpreterProxy firstIndexableField: smaller) len: smallerLen with: (interpreterProxy firstIndexableField: larger) len: largerLen into: (interpreterProxy firstIndexableField: res). ^neg ifTrue: [self normalizeNegative: res] ifFalse: [self normalizePositive: res]! Item was added: + ----- Method: LargeIntegersPlugin>>highBitOfLargeInt: (in category 'util') ----- + highBitOfLargeInt: aBytesOop + ^ self cDigitHighBit: (interpreterProxy firstIndexableField: aBytesOop) + len: (self digitSizeOfLargeInt: aBytesOop)! Item was added: + ----- Method: LargeIntegersPlugin>>largeInt:growTo: (in category 'oop util') ----- + largeInt: aBytesObject growTo: newLen + "Attention: this method invalidates all oop's!! Only newBytes is valid at return." + "Does not normalize." + | newBytes oldLen copyLen | + self remapOop: aBytesObject in: [newBytes := interpreterProxy instantiateClass: (interpreterProxy fetchClassOf: aBytesObject) + indexableSize: newLen]. + oldLen := self digitSizeOfLargeInt: aBytesObject. + oldLen < newLen + ifTrue: [copyLen := oldLen] + ifFalse: [copyLen := newLen]. + self + cDigitCopyFrom: (interpreterProxy firstIndexableField: aBytesObject) + to: (interpreterProxy firstIndexableField: newBytes) + len: copyLen. + ^ newBytes! Item was added: + ----- Method: LargeIntegersPlugin>>largeIntOrInt:growTo: (in category 'oop util') ----- + largeIntOrInt: oop growTo: len + "Attention: this method invalidates all oop's!! Only newBytes is valid at return." + | newBytes val class | + (interpreterProxy isIntegerObject: oop) + ifTrue: + [val := interpreterProxy integerValueOf: oop. + val < 0 + ifTrue: [class := interpreterProxy classLargeNegativeInteger] + ifFalse: [class := interpreterProxy classLargePositiveInteger]. + newBytes := interpreterProxy instantiateClass: class indexableSize: len. + self cCopyIntVal: val toBytes: newBytes] + ifFalse: [newBytes := self largeInt: oop growTo: len]. + ^ newBytes! Item was changed: ----- Method: LargeIntegersPlugin>>primAnyBitFrom:to: (in category 'Integer primitives') ----- primAnyBitFrom: from to: to | integer large | self debugCode: [self msg: 'primAnyBitFrom: from to: to']. integer := self primitive: 'primAnyBitFromTo' parameters: #(#SmallInteger #SmallInteger ) receiver: #Integer. (interpreterProxy isIntegerObject: integer) ifTrue: ["convert it to a not normalized LargeInteger" large := self createLargeFromSmallInteger: integer] ifFalse: [large := integer]. ^ (self + anyBitOfLargeInt: large - anyBitOfBytes: large from: from to: to) asOop: Boolean! Item was changed: ----- Method: LargeIntegersPlugin>>primDigit:bitShift: (in category 'development primitives') ----- primDigit: anInteger bitShift: shiftCount | rShift aLarge | self debugCode: [self msg: 'primDigit: anInteger bitShift: shiftCount']. self primitive: '_primDigitBitShift' parameters: #(Integer SmallInteger ) receiver: #Oop. (interpreterProxy isIntegerObject: anInteger) ifTrue: ["convert it to a not normalized LargeInteger" aLarge := self createLargeFromSmallInteger: anInteger] ifFalse: [aLarge := anInteger]. shiftCount >= 0 ifTrue: [^ self digit: aLarge Lshift: shiftCount] ifFalse: [rShift := 0 - shiftCount. ^ self normalize: (self digit: aLarge Rshift: rShift + lookfirst: (self digitSizeOfLargeInt: aLarge))]! - lookfirst: (self byteSizeOfBytes: aLarge))]! Item was changed: ----- Method: LargeIntegersPlugin>>primDigitBitShift: (in category 'obsolete') ----- primDigitBitShift: shiftCount | rShift aLarge anInteger | self debugCode: [self msg: 'primDigitBitShift: shiftCount']. anInteger := self primitive: 'primDigitBitShift' parameters: #(SmallInteger ) receiver: #Integer. (interpreterProxy isIntegerObject: anInteger) ifTrue: ["convert it to a not normalized LargeInteger" aLarge := self createLargeFromSmallInteger: anInteger] ifFalse: [aLarge := anInteger]. shiftCount >= 0 ifTrue: [^ self digit: aLarge Lshift: shiftCount] ifFalse: [rShift := 0 - shiftCount. ^ self normalize: (self digit: aLarge Rshift: rShift + lookfirst: (self digitSizeOfLargeInt: aLarge))]! - lookfirst: (self byteSizeOfBytes: aLarge))]! Item was changed: ----- Method: LargeIntegersPlugin>>primDigitBitShiftMagnitude: (in category 'Integer primitives') ----- primDigitBitShiftMagnitude: shiftCount | rShift aLarge anInteger | self debugCode: [self msg: 'primDigitBitShiftMagnitude: shiftCount']. anInteger := self primitive: 'primDigitBitShiftMagnitude' parameters: #(#SmallInteger ) receiver: #Integer. (interpreterProxy isIntegerObject: anInteger) ifTrue: ["convert it to a not normalized LargeInteger" aLarge := self createLargeFromSmallInteger: anInteger] ifFalse: [aLarge := anInteger]. shiftCount >= 0 ifTrue: [^ self digit: aLarge Lshift: shiftCount] ifFalse: [rShift := 0 - shiftCount. ^ self normalize: (self digit: aLarge Rshift: rShift + lookfirst: (self digitSizeOfLargeInt: aLarge))]! - lookfirst: (self byteSizeOfBytes: aLarge))]! Item was changed: ----- Method: LargeIntegersPlugin>>primGetModuleName (in category 'control & support primitives') ----- primGetModuleName "If calling this primitive fails, then C module does not exist." + | strLen strOop | - | strLen strOop strPtr | - <var: #cString type: 'char *'> - <var: #strPtr type: 'char *'> self debugCode: [self msg: 'primGetModuleName']. self primitive: 'primGetModuleName' parameters: #() receiver: #Oop. strLen := self strlen: self getModuleName. strOop := interpreterProxy instantiateClass: interpreterProxy classString indexableSize: strLen. + self st: (interpreterProxy firstIndexableField: strOop) + rn: self getModuleName + cpy: strLen. + ^strOop! - strPtr := interpreterProxy firstIndexableField: strOop. - 0 to: strLen - 1 do: [:i | strPtr at: i put: (self getModuleName at: i)]. - ^ strOop! Item was added: + ----- Method: LargeIntegersPlugin>>primMontgomeryDigitLength (in category 'Integer primitives') ----- + primMontgomeryDigitLength + self debugCode: [self msg: 'primMontgomeryDigitLength']. + self + primitive: 'primMontgomeryDigitLength' + parameters: #() + receiver: #Integer. + ^interpreterProxy integerObjectOf: 8! Item was added: + ----- Method: LargeIntegersPlugin>>unsafeDigitOf:at: (in category 'util') ----- + unsafeDigitOf: bytesObj at: ix + "Argument bytesObj must not be aSmallInteger!!" + <inline: true> + ^(interpreterProxy cCoerce: (interpreterProxy firstIndexableField: bytesObj) to: #'unsigned char *') at: ix - 1! Item was changed: ----- Method: VMMaker class>>versionString (in category 'version testing') ----- versionString "VMMaker versionString" + ^'4.15.5'! - ^'4.15.4'!

1 0

← Newer
1
2
3
4
5
6
7
...
14
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

Vm-dev March 2016