Vm-dev February 2016

vm-dev@lists.squeakfoundation.org

27 participants
141 discussions

[commit][3592] Provide a proper mvm script.
by commits＠squeakvm.org 13 Feb '16

13 Feb '16

Revision: 3592 Author: eliot Date: 2016-02-13 10:10:32 -0800 (Sat, 13 Feb 2016) Log Message: ----------- Provide a proper mvm script. Correct a straggler's svn:ignore 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.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.sista.spur/mvm branches/Cog/build.macos64x64/squeak.stack.spur/mvm Property Changed: ---------------- branches/Cog/build.macos32x86/glue.stack.spur/ 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-02-13 03:33:43 UTC (rev 3591) +++ branches/Cog/build.macos32x86/glue.cog.spur/mvm 2016-02-13 18:10:32 UTC (rev 3592) @@ -1,4 +1,24 @@ #!/bin/bash -make debug 2>&1 | tee LOGD -make assert 2>&1 | tee LOGA -make 2>&1 | tee LOGF +A=;D=;F= +if [ $# = 0 ]; then + A=1;D=1;F=1 +else + while getopts 'Aadf?' opt "$@"; do + case $opt in + A) A=1;D=1;F=1;; + a) A=1;; + d) D=1;; + f) F=1;; + *) echo usage $0 [-A] [-a\ [-d] [-f]; exit 0;; + esac + done +fi +if [ -n "$D" ]; then + make debug 2>&1 | tee LOGD +fi +if [ -n "$A" ]; then + make assert 2>&1 | tee LOGA +fi +if [ -n "$F" ]; then + make 2>&1 | tee LOGF +fi Property changes on: branches/Cog/build.macos32x86/glue.stack.spur ___________________________________________________________________ Modified: svn:ignore - Cocoa*.app build* deps getversion* sqNamedPrims.h + Cocoa*.app LOG* *.sources build* deps getversion* sqNamedPrims.h Modified: branches/Cog/build.macos32x86/glue.stack.spur/mvm =================================================================== --- branches/Cog/build.macos32x86/glue.stack.spur/mvm 2016-02-13 03:33:43 UTC (rev 3591) +++ branches/Cog/build.macos32x86/glue.stack.spur/mvm 2016-02-13 18:10:32 UTC (rev 3592) @@ -1,4 +1,24 @@ #!/bin/bash -make debug 2>&1 | tee LOGD -make assert 2>&1 | tee LOGA -make 2>&1 | tee LOGF +A=;D=;F= +if [ $# = 0 ]; then + A=1;D=1;F=1 +else + while getopts 'Aadf?' opt "$@"; do + case $opt in + A) A=1;D=1;F=1;; + a) A=1;; + d) D=1;; + f) F=1;; + *) echo usage $0 [-A] [-a\ [-d] [-f]; exit 0;; + esac + done +fi +if [ -n "$D" ]; then + make debug 2>&1 | tee LOGD +fi +if [ -n "$A" ]; then + make assert 2>&1 | tee LOGA +fi +if [ -n "$F" ]; then + make 2>&1 | tee LOGF +fi Modified: branches/Cog/build.macos32x86/newspeak.cog.spur/mvm =================================================================== --- branches/Cog/build.macos32x86/newspeak.cog.spur/mvm 2016-02-13 03:33:43 UTC (rev 3591) +++ branches/Cog/build.macos32x86/newspeak.cog.spur/mvm 2016-02-13 18:10:32 UTC (rev 3592) @@ -1,4 +1,24 @@ #!/bin/bash -make debug 2>&1 | tee LOGD -make assert 2>&1 | tee LOGA -make 2>&1 | tee LOGF +A=;D=;F= +if [ $# = 0 ]; then + A=1;D=1;F=1 +else + while getopts 'Aadf?' opt "$@"; do + case $opt in + A) A=1;D=1;F=1;; + a) A=1;; + d) D=1;; + f) F=1;; + *) echo usage $0 [-A] [-a\ [-d] [-f]; exit 0;; + esac + done +fi +if [ -n "$D" ]; then + make debug 2>&1 | tee LOGD +fi +if [ -n "$A" ]; then + make assert 2>&1 | tee LOGA +fi +if [ -n "$F" ]; then + make 2>&1 | tee LOGF +fi Modified: branches/Cog/build.macos32x86/newspeak.stack.spur/mvm =================================================================== --- branches/Cog/build.macos32x86/newspeak.stack.spur/mvm 2016-02-13 03:33:43 UTC (rev 3591) +++ branches/Cog/build.macos32x86/newspeak.stack.spur/mvm 2016-02-13 18:10:32 UTC (rev 3592) @@ -1,4 +1,24 @@ #!/bin/bash -make debug 2>&1 | tee LOGD -make assert 2>&1 | tee LOGA -make 2>&1 | tee LOGF +A=;D=;F= +if [ $# = 0 ]; then + A=1;D=1;F=1 +else + while getopts 'Aadf?' opt "$@"; do + case $opt in + A) A=1;D=1;F=1;; + a) A=1;; + d) D=1;; + f) F=1;; + *) echo usage $0 [-A] [-a\ [-d] [-f]; exit 0;; + esac + done +fi +if [ -n "$D" ]; then + make debug 2>&1 | tee LOGD +fi +if [ -n "$A" ]; then + make assert 2>&1 | tee LOGA +fi +if [ -n "$F" ]; then + make 2>&1 | tee LOGF +fi Modified: branches/Cog/build.macos32x86/pharo.cog.spur/mvm =================================================================== --- branches/Cog/build.macos32x86/pharo.cog.spur/mvm 2016-02-13 03:33:43 UTC (rev 3591) +++ branches/Cog/build.macos32x86/pharo.cog.spur/mvm 2016-02-13 18:10:32 UTC (rev 3592) @@ -1,4 +1,24 @@ #!/bin/bash -make debug 2>&1 | tee LOGD -make assert 2>&1 | tee LOGA -make 2>&1 | tee LOGF +A=;D=;F= +if [ $# = 0 ]; then + A=1;D=1;F=1 +else + while getopts 'Aadf?' opt "$@"; do + case $opt in + A) A=1;D=1;F=1;; + a) A=1;; + d) D=1;; + f) F=1;; + *) echo usage $0 [-A] [-a\ [-d] [-f]; exit 0;; + esac + done +fi +if [ -n "$D" ]; then + make debug 2>&1 | tee LOGD +fi +if [ -n "$A" ]; then + make assert 2>&1 | tee LOGA +fi +if [ -n "$F" ]; then + 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-02-13 03:33:43 UTC (rev 3591) +++ branches/Cog/build.macos32x86/squeak+immutability.cog.spur/mvm 2016-02-13 18:10:32 UTC (rev 3592) @@ -1,4 +1,24 @@ #!/bin/bash -make debug 2>&1 | tee LOGD -make assert 2>&1 | tee LOGA -make 2>&1 | tee LOGF +A=;D=;F= +if [ $# = 0 ]; then + A=1;D=1;F=1 +else + while getopts 'Aadf?' opt "$@"; do + case $opt in + A) A=1;D=1;F=1;; + a) A=1;; + d) D=1;; + f) F=1;; + *) echo usage $0 [-A] [-a\ [-d] [-f]; exit 0;; + esac + done +fi +if [ -n "$D" ]; then + make debug 2>&1 | tee LOGD +fi +if [ -n "$A" ]; then + make assert 2>&1 | tee LOGA +fi +if [ -n "$F" ]; then + make 2>&1 | tee LOGF +fi Modified: branches/Cog/build.macos32x86/squeak.cog.spur/mvm =================================================================== --- branches/Cog/build.macos32x86/squeak.cog.spur/mvm 2016-02-13 03:33:43 UTC (rev 3591) +++ branches/Cog/build.macos32x86/squeak.cog.spur/mvm 2016-02-13 18:10:32 UTC (rev 3592) @@ -1,4 +1,24 @@ #!/bin/bash -make debug 2>&1 | tee LOGD -make assert 2>&1 | tee LOGA -make 2>&1 | tee LOGF +A=;D=;F= +if [ $# = 0 ]; then + A=1;D=1;F=1 +else + while getopts 'Aadf?' opt "$@"; do + case $opt in + A) A=1;D=1;F=1;; + a) A=1;; + d) D=1;; + f) F=1;; + *) echo usage $0 [-A] [-a\ [-d] [-f]; exit 0;; + esac + done +fi +if [ -n "$D" ]; then + make debug 2>&1 | tee LOGD +fi +if [ -n "$A" ]; then + make assert 2>&1 | tee LOGA +fi +if [ -n "$F" ]; then + make 2>&1 | tee LOGF +fi Modified: branches/Cog/build.macos32x86/squeak.cog.v3/mvm =================================================================== --- branches/Cog/build.macos32x86/squeak.cog.v3/mvm 2016-02-13 03:33:43 UTC (rev 3591) +++ branches/Cog/build.macos32x86/squeak.cog.v3/mvm 2016-02-13 18:10:32 UTC (rev 3592) @@ -1,4 +1,24 @@ #!/bin/bash -make debug 2>&1 | tee LOGD -make assert 2>&1 | tee LOGA -make 2>&1 | tee LOGF +A=;D=;F= +if [ $# = 0 ]; then + A=1;D=1;F=1 +else + while getopts 'Aadf?' opt "$@"; do + case $opt in + A) A=1;D=1;F=1;; + a) A=1;; + d) D=1;; + f) F=1;; + *) echo usage $0 [-A] [-a\ [-d] [-f]; exit 0;; + esac + done +fi +if [ -n "$D" ]; then + make debug 2>&1 | tee LOGD +fi +if [ -n "$A" ]; then + make assert 2>&1 | tee LOGA +fi +if [ -n "$F" ]; then + make 2>&1 | tee LOGF +fi Modified: branches/Cog/build.macos32x86/squeak.sista.spur/mvm =================================================================== --- branches/Cog/build.macos32x86/squeak.sista.spur/mvm 2016-02-13 03:33:43 UTC (rev 3591) +++ branches/Cog/build.macos32x86/squeak.sista.spur/mvm 2016-02-13 18:10:32 UTC (rev 3592) @@ -1,4 +1,24 @@ #!/bin/bash -make debug 2>&1 | tee LOGD -make assert 2>&1 | tee LOGA -make 2>&1 | tee LOGF +A=;D=;F= +if [ $# = 0 ]; then + A=1;D=1;F=1 +else + while getopts 'Aadf?' opt "$@"; do + case $opt in + A) A=1;D=1;F=1;; + a) A=1;; + d) D=1;; + f) F=1;; + *) echo usage $0 [-A] [-a\ [-d] [-f]; exit 0;; + esac + done +fi +if [ -n "$D" ]; then + make debug 2>&1 | tee LOGD +fi +if [ -n "$A" ]; then + make assert 2>&1 | tee LOGA +fi +if [ -n "$F" ]; then + make 2>&1 | tee LOGF +fi Modified: branches/Cog/build.macos32x86/squeak.stack.spur/mvm =================================================================== --- branches/Cog/build.macos32x86/squeak.stack.spur/mvm 2016-02-13 03:33:43 UTC (rev 3591) +++ branches/Cog/build.macos32x86/squeak.stack.spur/mvm 2016-02-13 18:10:32 UTC (rev 3592) @@ -1,4 +1,24 @@ #!/bin/bash -make debug 2>&1 | tee LOGD -make assert 2>&1 | tee LOGA -make 2>&1 | tee LOGF +A=;D=;F= +if [ $# = 0 ]; then + A=1;D=1;F=1 +else + while getopts 'Aadf?' opt "$@"; do + case $opt in + A) A=1;D=1;F=1;; + a) A=1;; + d) D=1;; + f) F=1;; + *) echo usage $0 [-A] [-a\ [-d] [-f]; exit 0;; + esac + done +fi +if [ -n "$D" ]; then + make debug 2>&1 | tee LOGD +fi +if [ -n "$A" ]; then + make assert 2>&1 | tee LOGA +fi +if [ -n "$F" ]; then + make 2>&1 | tee LOGF +fi Modified: branches/Cog/build.macos32x86/squeak.stack.v3/mvm =================================================================== --- branches/Cog/build.macos32x86/squeak.stack.v3/mvm 2016-02-13 03:33:43 UTC (rev 3591) +++ branches/Cog/build.macos32x86/squeak.stack.v3/mvm 2016-02-13 18:10:32 UTC (rev 3592) @@ -1,4 +1,24 @@ #!/bin/bash -make debug 2>&1 | tee LOGD -make assert 2>&1 | tee LOGA -make 2>&1 | tee LOGF +A=;D=;F= +if [ $# = 0 ]; then + A=1;D=1;F=1 +else + while getopts 'Aadf?' opt "$@"; do + case $opt in + A) A=1;D=1;F=1;; + a) A=1;; + d) D=1;; + f) F=1;; + *) echo usage $0 [-A] [-a\ [-d] [-f]; exit 0;; + esac + done +fi +if [ -n "$D" ]; then + make debug 2>&1 | tee LOGD +fi +if [ -n "$A" ]; then + make assert 2>&1 | tee LOGA +fi +if [ -n "$F" ]; then + make 2>&1 | tee LOGF +fi Modified: branches/Cog/build.macos64x64/newspeak.cog.spur/mvm =================================================================== --- branches/Cog/build.macos64x64/newspeak.cog.spur/mvm 2016-02-13 03:33:43 UTC (rev 3591) +++ branches/Cog/build.macos64x64/newspeak.cog.spur/mvm 2016-02-13 18:10:32 UTC (rev 3592) @@ -1,4 +1,24 @@ #!/bin/bash -make debug 2>&1 | tee LOGD -make assert 2>&1 | tee LOGA -make 2>&1 | tee LOGF +A=;D=;F= +if [ $# = 0 ]; then + A=1;D=1;F=1 +else + while getopts 'Aadf?' opt "$@"; do + case $opt in + A) A=1;D=1;F=1;; + a) A=1;; + d) D=1;; + f) F=1;; + *) echo usage $0 [-A] [-a\ [-d] [-f]; exit 0;; + esac + done +fi +if [ -n "$D" ]; then + make debug 2>&1 | tee LOGD +fi +if [ -n "$A" ]; then + make assert 2>&1 | tee LOGA +fi +if [ -n "$F" ]; then + make 2>&1 | tee LOGF +fi Modified: branches/Cog/build.macos64x64/newspeak.stack.spur/mvm =================================================================== --- branches/Cog/build.macos64x64/newspeak.stack.spur/mvm 2016-02-13 03:33:43 UTC (rev 3591) +++ branches/Cog/build.macos64x64/newspeak.stack.spur/mvm 2016-02-13 18:10:32 UTC (rev 3592) @@ -1,4 +1,24 @@ #!/bin/bash -make debug 2>&1 | tee LOGD -make assert 2>&1 | tee LOGA -make 2>&1 | tee LOGF +A=;D=;F= +if [ $# = 0 ]; then + A=1;D=1;F=1 +else + while getopts 'Aadf?' opt "$@"; do + case $opt in + A) A=1;D=1;F=1;; + a) A=1;; + d) D=1;; + f) F=1;; + *) echo usage $0 [-A] [-a\ [-d] [-f]; exit 0;; + esac + done +fi +if [ -n "$D" ]; then + make debug 2>&1 | tee LOGD +fi +if [ -n "$A" ]; then + make assert 2>&1 | tee LOGA +fi +if [ -n "$F" ]; then + make 2>&1 | tee LOGF +fi Modified: branches/Cog/build.macos64x64/pharo.cog.spur/mvm =================================================================== --- branches/Cog/build.macos64x64/pharo.cog.spur/mvm 2016-02-13 03:33:43 UTC (rev 3591) +++ branches/Cog/build.macos64x64/pharo.cog.spur/mvm 2016-02-13 18:10:32 UTC (rev 3592) @@ -1,4 +1,24 @@ #!/bin/bash -make debug 2>&1 | tee LOGD -make assert 2>&1 | tee LOGA -make 2>&1 | tee LOGF +A=;D=;F= +if [ $# = 0 ]; then + A=1;D=1;F=1 +else + while getopts 'Aadf?' opt "$@"; do + case $opt in + A) A=1;D=1;F=1;; + a) A=1;; + d) D=1;; + f) F=1;; + *) echo usage $0 [-A] [-a\ [-d] [-f]; exit 0;; + esac + done +fi +if [ -n "$D" ]; then + make debug 2>&1 | tee LOGD +fi +if [ -n "$A" ]; then + make assert 2>&1 | tee LOGA +fi +if [ -n "$F" ]; then + make 2>&1 | tee LOGF +fi Modified: branches/Cog/build.macos64x64/squeak.cog.spur/mvm =================================================================== --- branches/Cog/build.macos64x64/squeak.cog.spur/mvm 2016-02-13 03:33:43 UTC (rev 3591) +++ branches/Cog/build.macos64x64/squeak.cog.spur/mvm 2016-02-13 18:10:32 UTC (rev 3592) @@ -1,4 +1,24 @@ #!/bin/bash -make debug 2>&1 | tee LOGD -make assert 2>&1 | tee LOGA -make 2>&1 | tee LOGF +A=;D=;F= +if [ $# = 0 ]; then + A=1;D=1;F=1 +else + while getopts 'Aadf?' opt "$@"; do + case $opt in + A) A=1;D=1;F=1;; + a) A=1;; + d) D=1;; + f) F=1;; + *) echo usage $0 [-A] [-a\ [-d] [-f]; exit 0;; + esac + done +fi +if [ -n "$D" ]; then + make debug 2>&1 | tee LOGD +fi +if [ -n "$A" ]; then + make assert 2>&1 | tee LOGA +fi +if [ -n "$F" ]; then + make 2>&1 | tee LOGF +fi Modified: branches/Cog/build.macos64x64/squeak.sista.spur/mvm =================================================================== --- branches/Cog/build.macos64x64/squeak.sista.spur/mvm 2016-02-13 03:33:43 UTC (rev 3591) +++ branches/Cog/build.macos64x64/squeak.sista.spur/mvm 2016-02-13 18:10:32 UTC (rev 3592) @@ -1,4 +1,24 @@ #!/bin/bash -make debug 2>&1 | tee LOGD -make assert 2>&1 | tee LOGA -make 2>&1 | tee LOGF +A=;D=;F= +if [ $# = 0 ]; then + A=1;D=1;F=1 +else + while getopts 'Aadf?' opt "$@"; do + case $opt in + A) A=1;D=1;F=1;; + a) A=1;; + d) D=1;; + f) F=1;; + *) echo usage $0 [-A] [-a\ [-d] [-f]; exit 0;; + esac + done +fi +if [ -n "$D" ]; then + make debug 2>&1 | tee LOGD +fi +if [ -n "$A" ]; then + make assert 2>&1 | tee LOGA +fi +if [ -n "$F" ]; then + make 2>&1 | tee LOGF +fi Modified: branches/Cog/build.macos64x64/squeak.stack.spur/mvm =================================================================== --- branches/Cog/build.macos64x64/squeak.stack.spur/mvm 2016-02-13 03:33:43 UTC (rev 3591) +++ branches/Cog/build.macos64x64/squeak.stack.spur/mvm 2016-02-13 18:10:32 UTC (rev 3592) @@ -1,4 +1,24 @@ #!/bin/bash -make debug 2>&1 | tee LOGD -make assert 2>&1 | tee LOGA -make 2>&1 | tee LOGF +A=;D=;F= +if [ $# = 0 ]; then + A=1;D=1;F=1 +else + while getopts 'Aadf?' opt "$@"; do + case $opt in + A) A=1;D=1;F=1;; + a) A=1;; + d) D=1;; + f) F=1;; + *) echo usage $0 [-A] [-a\ [-d] [-f]; exit 0;; + esac + done +fi +if [ -n "$D" ]; then + make debug 2>&1 | tee LOGD +fi +if [ -n "$A" ]; then + make assert 2>&1 | tee LOGA +fi +if [ -n "$F" ]; then + make 2>&1 | tee LOGF +fi Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h ___________________________________________________________________ Modified: checkindate - Fri Feb 12 19:25:38 PST 2016 + Sat Feb 13 10:09:26 PST 2016

1 0

Termination semaphore for Process
by Max Leske 13 Feb '16

13 Feb '16

Hi all, I have a proposal and I’d like to hear your opinion. Right now, when I want to wait for a process to finish I use something like #forkAndWait or I write a block with semaphores myself. This works fine for processes that I spawn and then immediately want to wait for. But what if I spawn a process somewhere else and only later know that I want to wait for its termination? Currently I would construct a polling loop to do that. Here’s a different idea (which I’ve tested): 1. add instance variable “terminationSemaphore” to Process 2. at the end of Process>>terminate #ensure: that all waiting processes are signaled 3. add #waitForTermination message to Process: waitForTermination terminationSemaphore ifNil: [ terminationSemaphore := Semaphore new ]. self resume. terminationSemaphore wait This enables code like the following: result := 0. p := [ result := 2. 2 seconds asDelay wait ] newProcess priority: 20; yourself. “don’t run the new process yet" [ p waitForTermination. result2 := 3. ] forkAt: 30. “p is now running, the second process is waiting" p waitForTermination. “p is still running, two processes are waiting” “because processes waiting on a semaphore are signaled in the order they sent #wait we even achieve ordering (at least with equal process priorities) and so ‘result2’ is not nil but 3” {result. result2} “#(2 3) I wrote this in 10 minutes, so there’s room for polishing. I just want to know if this is something other people might want and if there are potential problems with process termination and semaphores which I am not aware of. Cheers, Max

2 2

[commit][3591] CogVM source as per VMMaker.oscog-eem.1677
by commits＠squeakvm.org 13 Feb '16

13 Feb '16

Revision: 3591 Author: eliot Date: 2016-02-12 19:33:43 -0800 (Fri, 12 Feb 2016) Log Message: ----------- CogVM source as per VMMaker.oscog-eem.1677 NewspeakVM: Don't use cppIf: #NewspeakVM in VM code. It is appropriate only in plugin code. VM code should use the NewspeakVM variable from VMBasicConstants. Nuke the obsolete Newspeak interpreter src (nssrc). Slang: Fix nilOrBooleanConditionFor: to also work for symbol arguments (such as #Newspeak). Emit "# define FOO" for conditionally defined FOO instead of "#define FOO" which is nice for grepping. IMMUTABILITY: Fix the declaration/definition of ceCannotAssignTo:withIndex:valueToAssign: which needs to be included, but only if -DIMMUTABILITY=1. So modify Slang to output #if FOO && !BAR code around functions that include option: pragmas whose arguments are in namesDefinedAtCompileTime. This also fixes generation of Pharo-specific support code in the FilePlugin. MacOS X build Fix memory support for v3 VMs; sqMacV2Memory.[ch] must be in Common; sqUnixMemory should not be used. Fix stack backtrace for STACKVMs (no writeback of machine stack pointers). Fix makefiles to chose correct sources for stack VM builds. Modified Paths: -------------- branches/Cog/build.macos32x86/common/Makefile.app branches/Cog/build.macos32x86/common/Makefile.vm branches/Cog/build.macos32x86/pharo.cog.spur/plugins.int branches/Cog/build.macos32x86/squeak+immutability.cog.spur/plugins.int branches/Cog/build.macos32x86/squeak.cog.spur/plugins.int branches/Cog/build.macos32x86/squeak.cog.v3/plugins.int branches/Cog/build.macos32x86/squeak.sista.spur/plugins.int branches/Cog/build.macos32x86/squeak.stack.spur/plugins.int branches/Cog/build.macos32x86/squeak.stack.v3/plugins.int branches/Cog/build.macos64x64/common/Makefile.app branches/Cog/build.macos64x64/common/Makefile.vm branches/Cog/build.macos64x64/pharo.cog.spur/plugins.int branches/Cog/build.macos64x64/squeak.cog.spur/plugins.int branches/Cog/build.macos64x64/squeak.sista.spur/plugins.int branches/Cog/build.macos64x64/squeak.stack.spur/plugins.int branches/Cog/nsspur64src/vm/cogit.h branches/Cog/nsspur64src/vm/cogitX64.c branches/Cog/nsspur64src/vm/cointerp.c branches/Cog/nsspur64src/vm/cointerp.h branches/Cog/nsspur64src/vm/gcc3x-cointerp.c branches/Cog/nsspursrc/vm/cogit.h branches/Cog/nsspursrc/vm/cogitARMv5.c branches/Cog/nsspursrc/vm/cogitIA32.c branches/Cog/nsspursrc/vm/cogitMIPSEL.c branches/Cog/nsspursrc/vm/cointerp.c branches/Cog/nsspursrc/vm/cointerp.h branches/Cog/nsspursrc/vm/gcc3x-cointerp.c branches/Cog/nsspurstack64src/vm/gcc3x-interp.c branches/Cog/nsspurstack64src/vm/interp.c branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c branches/Cog/nsspurstacksrc/vm/interp.c branches/Cog/platforms/iOS/vm/Common/Classes/sqSqueakMainApp.m branches/Cog/platforms/iOS/vm/OSX/sqPlatformSpecific.h branches/Cog/platforms/unix/vm/sqUnixMain.c branches/Cog/spur64src/vm/cogit.h branches/Cog/spur64src/vm/cogitX64.c branches/Cog/spur64src/vm/cointerp.c branches/Cog/spur64src/vm/cointerp.h branches/Cog/spur64src/vm/gcc3x-cointerp.c branches/Cog/spursistasrc/vm/cogit.h branches/Cog/spursistasrc/vm/cogitARMv5.c branches/Cog/spursistasrc/vm/cogitIA32.c branches/Cog/spursistasrc/vm/cogitMIPSEL.c branches/Cog/spursistasrc/vm/cointerp.c branches/Cog/spursistasrc/vm/cointerp.h branches/Cog/spursistasrc/vm/gcc3x-cointerp.c branches/Cog/spursrc/vm/cogit.h branches/Cog/spursrc/vm/cogitARMv5.c branches/Cog/spursrc/vm/cogitIA32.c branches/Cog/spursrc/vm/cogitMIPSEL.c branches/Cog/spursrc/vm/cointerp.c branches/Cog/spursrc/vm/cointerp.h branches/Cog/spursrc/vm/gcc3x-cointerp.c branches/Cog/spurstack64src/vm/gcc3x-interp.c branches/Cog/spurstack64src/vm/interp.c branches/Cog/spurstacksrc/vm/gcc3x-interp.c branches/Cog/spurstacksrc/vm/interp.c branches/Cog/src/plugins/FilePlugin/FilePlugin.c branches/Cog/src/plugins/IA32ABI/IA32ABI.c branches/Cog/src/plugins/MiscPrimitivePlugin/MiscPrimitivePlugin.c branches/Cog/src/plugins/SerialPlugin/SerialPlugin.c branches/Cog/src/plugins/Win32OSProcessPlugin/Win32OSProcessPlugin.c branches/Cog/src/vm/cogit.h branches/Cog/src/vm/cogitARMv5.c branches/Cog/src/vm/cogitIA32.c branches/Cog/src/vm/cogitMIPSEL.c branches/Cog/src/vm/cointerp.c branches/Cog/src/vm/cointerp.h branches/Cog/src/vm/cointerpmt.c branches/Cog/src/vm/cointerpmt.h branches/Cog/src/vm/gcc3x-cointerp.c branches/Cog/src/vm/gcc3x-cointerpmt.c branches/Cog/stacksrc/vm/gcc3x-interp.c branches/Cog/stacksrc/vm/interp.c Added Paths: ----------- branches/Cog/platforms/iOS/vm/Common/sqMacV2Memory.c branches/Cog/platforms/iOS/vm/Common/sqMacV2Memory.h Removed Paths: ------------- branches/Cog/nssrc/ branches/Cog/platforms/iOS/vm/iPhone/sqMacV2Memory.c branches/Cog/platforms/iOS/vm/iPhone/sqMacV2Memory.h Property Changed: ---------------- branches/Cog/platforms/Cross/vm/sqSCCSVersion.h Modified: branches/Cog/build.macos32x86/common/Makefile.app =================================================================== --- branches/Cog/build.macos32x86/common/Makefile.app 2016-02-12 19:45:55 UTC (rev 3590) +++ branches/Cog/build.macos32x86/common/Makefile.app 2016-02-13 03:33:43 UTC (rev 3591) @@ -54,10 +54,10 @@ VMICONS:=$(addprefix $(APP)/Contents/Resources/,$(notdir $(OSXICONS))) VMMENUNIB:=$(APP)/Contents/Resources/English.lproj/MainMenu.nib SOURCES:= -ifneq ("$(SOURCEFILE)",) +ifneq ($(SOURCEFILE),) SOURCES:=./$(SOURCEFILE) endif -ifneq ("$(APPSOURCE)",) +ifneq ($(APPSOURCE),) SOURCES:=$(SOURCES) $(APP)/Contents/Resources/$(APPSOURCE) endif @@ -96,7 +96,7 @@ # To sign the app, set SIGNING_IDENTITY in the environment, e.g. # export SIGNING_IDENTITY="Developer ID Application: Eliot Miranda" # -ifeq ("$(SIGNING_IDENTITY)",) +ifeq ($(SIGNING_IDENTITY),) signapp: echo "No signing identity found (SIGNING_IDENTITY unset). Not signing app." else @@ -121,4 +121,7 @@ @echo VMBUNDLES=$(VMBUNDLES) @echo VMPLIST=$(VMPLIST) @echo VMICONS=$(VMICONS) + @echo SIGNING_IDENTITY=$(SIGNING_IDENTITY) + @echo SOURCEFILE=$(SOURCEFILE) + @echo APPSOURCE=$(APPSOURCE) @echo ----------------------------------------------------- Modified: branches/Cog/build.macos32x86/common/Makefile.vm =================================================================== --- branches/Cog/build.macos32x86/common/Makefile.vm 2016-02-12 19:45:55 UTC (rev 3590) +++ branches/Cog/build.macos32x86/common/Makefile.vm 2016-02-13 03:33:43 UTC (rev 3591) @@ -52,14 +52,14 @@ OSXPLUGINSDIR:=$(PLATDIR)/iOS/plugins UNIXVMDIR:=$(PLATDIR)/unix/vm -MAKERSRC:=$(addprefix $(VMSRCDIR)/,gcc3x-cointerp.c cogit.c) +MAKERSRC:=$(wildcard $(VMSRCDIR)/gcc3x-*interp.c $(VMSRCDIR)/cogit.c) CROSSSRC:= $(wildcard $(CROSSDIR)/*.c) XEX:=%/sqSqueakMainApplication+screen.m OSXSRC:=$(wildcard $(OSXDIR)/*.c) $(filter-out $(XEX),$(wildcard $(OSXDIR)/*.m)) \ $(wildcard $(OSXCOMMONDIR)/*.c) $(wildcard $(OSXCOMMONDIR)/*.m) \ $(wildcard $(OSXCLASSESDIR)/*.c) $(wildcard $(OSXCLASSESDIR)/*.m) -UNIXSRC:=$(addprefix $(UNIXVMDIR)/,aio.c sqUnixHeartbeat.c sqUnixMemory.c \ - sqUnixSpurMemory.c sqUnixThreads.c sqUnixVMProfile.c) +UNIXSRC:=$(addprefix $(UNIXVMDIR)/,aio.c sqUnixHeartbeat.c sqUnixSpurMemory.c \ + sqUnixThreads.c sqUnixVMProfile.c) VMSRC:= $(MAKERSRC) $(CROSSSRC) $(OSXSRC) $(UNIXSRC) VMOBJ:= $(notdir $(VMSRC)) VMOBJ:= $(VMOBJ:.c=.o) Modified: branches/Cog/build.macos32x86/pharo.cog.spur/plugins.int =================================================================== --- branches/Cog/build.macos32x86/pharo.cog.spur/plugins.int 2016-02-12 19:45:55 UTC (rev 3590) +++ branches/Cog/build.macos32x86/pharo.cog.spur/plugins.int 2016-02-13 03:33:43 UTC (rev 3591) @@ -22,7 +22,6 @@ MiscPrimitivePlugin \ RePlugin \ SecurityPlugin \ -SerialPlugin \ SocketPlugin \ SoundCodecPrims \ SoundGenerationPlugin \ @@ -31,4 +30,5 @@ SurfacePlugin \ UUIDPlugin \ VMProfileMacSupportPlugin \ -# JoystickTabletPlugin +# JoystickTabletPlugin \ +# SerialPlugin Modified: branches/Cog/build.macos32x86/squeak+immutability.cog.spur/plugins.int =================================================================== --- branches/Cog/build.macos32x86/squeak+immutability.cog.spur/plugins.int 2016-02-12 19:45:55 UTC (rev 3590) +++ branches/Cog/build.macos32x86/squeak+immutability.cog.spur/plugins.int 2016-02-13 03:33:43 UTC (rev 3591) @@ -22,7 +22,6 @@ MiscPrimitivePlugin \ RePlugin \ SecurityPlugin \ -SerialPlugin \ SocketPlugin \ SoundCodecPrims \ SoundGenerationPlugin \ @@ -31,4 +30,5 @@ SurfacePlugin \ UUIDPlugin \ VMProfileMacSupportPlugin \ -# JoystickTabletPlugin +# JoystickTabletPlugin \ +# SerialPlugin Modified: branches/Cog/build.macos32x86/squeak.cog.spur/plugins.int =================================================================== --- branches/Cog/build.macos32x86/squeak.cog.spur/plugins.int 2016-02-12 19:45:55 UTC (rev 3590) +++ branches/Cog/build.macos32x86/squeak.cog.spur/plugins.int 2016-02-13 03:33:43 UTC (rev 3591) @@ -22,7 +22,6 @@ MiscPrimitivePlugin \ RePlugin \ SecurityPlugin \ -SerialPlugin \ SocketPlugin \ SoundCodecPrims \ SoundGenerationPlugin \ @@ -31,4 +30,5 @@ SurfacePlugin \ UUIDPlugin \ VMProfileMacSupportPlugin \ -# JoystickTabletPlugin +# JoystickTabletPlugin \ +# SerialPlugin Modified: branches/Cog/build.macos32x86/squeak.cog.v3/plugins.int =================================================================== --- branches/Cog/build.macos32x86/squeak.cog.v3/plugins.int 2016-02-12 19:45:55 UTC (rev 3590) +++ branches/Cog/build.macos32x86/squeak.cog.v3/plugins.int 2016-02-13 03:33:43 UTC (rev 3591) @@ -22,7 +22,6 @@ MiscPrimitivePlugin \ RePlugin \ SecurityPlugin \ -SerialPlugin \ SocketPlugin \ SoundCodecPrims \ SoundGenerationPlugin \ @@ -31,4 +30,5 @@ SurfacePlugin \ UUIDPlugin \ VMProfileMacSupportPlugin \ -# JoystickTabletPlugin +# JoystickTabletPlugin \ +# SerialPlugin Modified: branches/Cog/build.macos32x86/squeak.sista.spur/plugins.int =================================================================== --- branches/Cog/build.macos32x86/squeak.sista.spur/plugins.int 2016-02-12 19:45:55 UTC (rev 3590) +++ branches/Cog/build.macos32x86/squeak.sista.spur/plugins.int 2016-02-13 03:33:43 UTC (rev 3591) @@ -22,7 +22,6 @@ MiscPrimitivePlugin \ RePlugin \ SecurityPlugin \ -SerialPlugin \ SocketPlugin \ SoundCodecPrims \ SoundGenerationPlugin \ @@ -31,4 +30,5 @@ SurfacePlugin \ UUIDPlugin \ VMProfileMacSupportPlugin \ -# JoystickTabletPlugin +# JoystickTabletPlugin \ +# SerialPlugin Modified: branches/Cog/build.macos32x86/squeak.stack.spur/plugins.int =================================================================== --- branches/Cog/build.macos32x86/squeak.stack.spur/plugins.int 2016-02-12 19:45:55 UTC (rev 3590) +++ branches/Cog/build.macos32x86/squeak.stack.spur/plugins.int 2016-02-13 03:33:43 UTC (rev 3591) @@ -22,7 +22,6 @@ MiscPrimitivePlugin \ RePlugin \ SecurityPlugin \ -SerialPlugin \ SocketPlugin \ SoundCodecPrims \ SoundGenerationPlugin \ @@ -31,4 +30,5 @@ SurfacePlugin \ UUIDPlugin \ VMProfileMacSupportPlugin \ -# JoystickTabletPlugin +# JoystickTabletPlugin \ +# SerialPlugin Modified: branches/Cog/build.macos32x86/squeak.stack.v3/plugins.int =================================================================== --- branches/Cog/build.macos32x86/squeak.stack.v3/plugins.int 2016-02-12 19:45:55 UTC (rev 3590) +++ branches/Cog/build.macos32x86/squeak.stack.v3/plugins.int 2016-02-13 03:33:43 UTC (rev 3591) @@ -22,7 +22,6 @@ MiscPrimitivePlugin \ RePlugin \ SecurityPlugin \ -SerialPlugin \ SocketPlugin \ SoundCodecPrims \ SoundGenerationPlugin \ @@ -31,4 +30,5 @@ SurfacePlugin \ UUIDPlugin \ VMProfileMacSupportPlugin \ -# JoystickTabletPlugin +# JoystickTabletPlugin \ +# SerialPlugin Modified: branches/Cog/build.macos64x64/common/Makefile.app =================================================================== --- branches/Cog/build.macos64x64/common/Makefile.app 2016-02-12 19:45:55 UTC (rev 3590) +++ branches/Cog/build.macos64x64/common/Makefile.app 2016-02-13 03:33:43 UTC (rev 3591) @@ -54,10 +54,10 @@ VMICONS:=$(addprefix $(APP)/Contents/Resources/,$(notdir $(OSXICONS))) VMMENUNIB:=$(APP)/Contents/Resources/English.lproj/MainMenu.nib SOURCES:= -ifneq ("$(SOURCEFILE)",) +ifneq ($(SOURCEFILE),) SOURCES:=./$(SOURCEFILE) endif -ifneq ("$(APPSOURCE)",) +ifneq ($(APPSOURCE),) SOURCES:=$(SOURCES) $(APP)/Contents/Resources/$(APPSOURCE) endif @@ -96,7 +96,7 @@ # To sign the app, set SIGNING_IDENTITY in the environment, e.g. # export SIGNING_IDENTITY="Developer ID Application: Eliot Miranda" # -ifeq ("$(SIGNING_IDENTITY)",) +ifeq ($(SIGNING_IDENTITY),) signapp: echo "No signing identity found (SIGNING_IDENTITY unset). Not signing app." else @@ -121,4 +121,7 @@ @echo VMBUNDLES=$(VMBUNDLES) @echo VMPLIST=$(VMPLIST) @echo VMICONS=$(VMICONS) + @echo SIGNING_IDENTITY=$(SIGNING_IDENTITY) + @echo SOURCEFILE=$(SOURCEFILE) + @echo APPSOURCE=$(APPSOURCE) @echo ----------------------------------------------------- Modified: branches/Cog/build.macos64x64/common/Makefile.vm =================================================================== --- branches/Cog/build.macos64x64/common/Makefile.vm 2016-02-12 19:45:55 UTC (rev 3590) +++ branches/Cog/build.macos64x64/common/Makefile.vm 2016-02-13 03:33:43 UTC (rev 3591) @@ -52,14 +52,14 @@ OSXPLUGINSDIR:=$(PLATDIR)/iOS/plugins UNIXVMDIR:=$(PLATDIR)/unix/vm -MAKERSRC:=$(addprefix $(VMSRCDIR)/,gcc3x-cointerp.c cogit.c) +MAKERSRC:=$(wildcard $(VMSRCDIR)/gcc3x-*interp.c $(VMSRCDIR)/cogit.c) CROSSSRC:= $(wildcard $(CROSSDIR)/*.c) XEX:=%/sqSqueakMainApplication+screen.m OSXSRC:=$(wildcard $(OSXDIR)/*.c) $(filter-out $(XEX),$(wildcard $(OSXDIR)/*.m)) \ $(wildcard $(OSXCOMMONDIR)/*.c) $(wildcard $(OSXCOMMONDIR)/*.m) \ $(wildcard $(OSXCLASSESDIR)/*.c) $(wildcard $(OSXCLASSESDIR)/*.m) -UNIXSRC:=$(addprefix $(UNIXVMDIR)/,aio.c sqUnixHeartbeat.c sqUnixMemory.c \ - sqUnixSpurMemory.c sqUnixThreads.c sqUnixVMProfile.c) +UNIXSRC:=$(addprefix $(UNIXVMDIR)/,aio.c sqUnixHeartbeat.c sqUnixSpurMemory.c \ + sqUnixThreads.c sqUnixVMProfile.c) VMSRC:= $(MAKERSRC) $(CROSSSRC) $(OSXSRC) $(UNIXSRC) VMOBJ:= $(notdir $(VMSRC)) VMOBJ:= $(VMOBJ:.c=.o) Modified: branches/Cog/build.macos64x64/pharo.cog.spur/plugins.int =================================================================== --- branches/Cog/build.macos64x64/pharo.cog.spur/plugins.int 2016-02-12 19:45:55 UTC (rev 3590) +++ branches/Cog/build.macos64x64/pharo.cog.spur/plugins.int 2016-02-13 03:33:43 UTC (rev 3591) @@ -30,5 +30,5 @@ SurfacePlugin \ UUIDPlugin \ VMProfileMacSupportPlugin \ -# SerialPlugin \ -# JoystickTabletPlugin +# JoystickTabletPlugin \ +# SerialPlugin Modified: branches/Cog/build.macos64x64/squeak.cog.spur/plugins.int =================================================================== --- branches/Cog/build.macos64x64/squeak.cog.spur/plugins.int 2016-02-12 19:45:55 UTC (rev 3590) +++ branches/Cog/build.macos64x64/squeak.cog.spur/plugins.int 2016-02-13 03:33:43 UTC (rev 3591) @@ -22,7 +22,6 @@ MiscPrimitivePlugin \ RePlugin \ SecurityPlugin \ -SerialPlugin \ SocketPlugin \ SoundCodecPrims \ SoundGenerationPlugin \ @@ -31,4 +30,5 @@ SurfacePlugin \ UUIDPlugin \ VMProfileMacSupportPlugin \ -# JoystickTabletPlugin +# JoystickTabletPlugin \ +# SerialPlugin Modified: branches/Cog/build.macos64x64/squeak.sista.spur/plugins.int =================================================================== --- branches/Cog/build.macos64x64/squeak.sista.spur/plugins.int 2016-02-12 19:45:55 UTC (rev 3590) +++ branches/Cog/build.macos64x64/squeak.sista.spur/plugins.int 2016-02-13 03:33:43 UTC (rev 3591) @@ -26,7 +26,6 @@ MiscPrimitivePlugin \ RePlugin \ SecurityPlugin \ -SerialPlugin \ SocketPlugin \ SoundCodecPrims \ SoundGenerationPlugin \ @@ -35,4 +34,5 @@ SurfacePlugin \ UUIDPlugin \ VMProfileMacSupportPlugin \ -# JoystickTabletPlugin +# JoystickTabletPlugin \ +# SerialPlugin Modified: branches/Cog/build.macos64x64/squeak.stack.spur/plugins.int =================================================================== --- branches/Cog/build.macos64x64/squeak.stack.spur/plugins.int 2016-02-12 19:45:55 UTC (rev 3590) +++ branches/Cog/build.macos64x64/squeak.stack.spur/plugins.int 2016-02-13 03:33:43 UTC (rev 3591) @@ -22,7 +22,6 @@ MiscPrimitivePlugin \ RePlugin \ SecurityPlugin \ -SerialPlugin \ SocketPlugin \ SoundCodecPrims \ SoundGenerationPlugin \ @@ -31,8 +30,9 @@ SurfacePlugin \ UUIDPlugin \ VMProfileMacSupportPlugin \ -#B3DAcceleratorPlugin \ -#ClipboardExtendedPlugin \ -#MIDIPlugin \ -#InternetConfigPlugin \ -# JoystickTabletPlugin +# B3DAcceleratorPlugin \ +# ClipboardExtendedPlugin \ +# InternetConfigPlugin \ +# JoystickTabletPlugin \ +# MIDIPlugin \ +# SerialPlugin Modified: branches/Cog/nsspur64src/vm/cogit.h =================================================================== --- branches/Cog/nsspur64src/vm/cogit.h 2016-02-12 19:45:55 UTC (rev 3590) +++ branches/Cog/nsspur64src/vm/cogit.h 2016-02-13 03:33:43 UTC (rev 3591) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.1670 uuid: 6ba2dd3d-ab44-468e-9184-1c85580f980b + CCodeGenerator VMMaker.oscog-eem.1677 uuid: 7056bb77-6aa0-4cb6-aa6c-cd921c231d37 */ Modified: branches/Cog/nsspur64src/vm/cogitX64.c =================================================================== --- branches/Cog/nsspur64src/vm/cogitX64.c 2016-02-12 19:45:55 UTC (rev 3590) +++ branches/Cog/nsspur64src/vm/cogitX64.c 2016-02-13 03:33:43 UTC (rev 3591) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.1668 uuid: 1f0b27be-e423-42d3-a18d-1c7e292a4f14 + CCodeGenerator VMMaker.oscog-eem.1677 uuid: 7056bb77-6aa0-4cb6-aa6c-cd921c231d37 from - StackToRegisterMappingCogit VMMaker.oscog-eem.1668 uuid: 1f0b27be-e423-42d3-a18d-1c7e292a4f14 + StackToRegisterMappingCogit VMMaker.oscog-eem.1677 uuid: 7056bb77-6aa0-4cb6-aa6c-cd921c231d37 */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1668 uuid: 1f0b27be-e423-42d3-a18d-1c7e292a4f14 " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1677 uuid: 7056bb77-6aa0-4cb6-aa6c-cd921c231d37 " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -185,7 +185,7 @@ #define HeaderIndex 0 #define IDIVR 117 #if !defined(IMMUTABILITY) /* Allow this to be overridden on the compiler command line */ -#define IMMUTABILITY 0 +# define IMMUTABILITY 0 #endif #define IMULRR 118 #define InstanceSpecificationIndex 2 @@ -817,7 +817,16 @@ static sqInt NoDbgRegParms genGetFormatOfintoleastSignificantHalfOfBaseHeaderIntoScratch(sqInt sourceReg, sqInt destReg, sqInt scratchRegOrNone); static sqInt NoDbgRegParms genGetNumSlotsOfinto(sqInt srcReg, sqInt destReg); static sqInt NoDbgRegParms genGetRawSlotSizeOfNonImminto(sqInt sourceReg, sqInt destReg); +#if IMMUTABILITY +static AbstractInstruction * NoDbgRegParms genJumpBaseHeaderImmutable(sqInt baseHeaderReg); +#endif /* IMMUTABILITY */ +#if IMMUTABILITY +static AbstractInstruction * NoDbgRegParms genJumpBaseHeaderMutable(sqInt baseHeaderReg); +#endif /* IMMUTABILITY */ static AbstractInstruction * NoDbgRegParms genJumpImmediate(sqInt aRegister); +#if IMMUTABILITY +static AbstractInstruction * NoDbgRegParms genJumpMutablescratchReg(sqInt sourceReg, sqInt scratchReg); +#endif /* IMMUTABILITY */ static sqInt NoDbgRegParms genNewArrayOfSizeinitialized(sqInt size, sqInt initialized); static sqInt NoDbgRegParms genNoPopCreateClosureAtnumArgsnumCopiedcontextNumArgslargeinBlock(sqInt bcpc, sqInt numArgs, sqInt numCopied, sqInt ctxtNumArgs, sqInt isLargeCtxt, sqInt isInBlock); static sqInt genPrimitiveAsCharacter(void); @@ -1171,6 +1180,7 @@ void (*ceCallCogCodePopReceiverArg0Regs)(void); void (*ceCallCogCodePopReceiverArg1Arg0Regs)(void); void (*ceCallCogCodePopReceiverReg)(void); +static sqInt ceCannotAssignToWithIndexTrampoline; sqInt ceCannotResumeTrampoline; void (*ceCaptureCStackPointers)(void); static unsigned long (*ceCheckFeaturesFunction)(void); @@ -7574,13 +7584,9 @@ markAndTraceLiteralinat((cogMethod->selector), cogMethod, (&((cogMethod->selector)))); maybeMarkCountersIn(cogMethod); /* begin maybeMarkIRCsIn: */ - -# if NewspeakVM markIfIRC((cogMethod->nextMethodOrIRCs)); -# endif /* NewspeakVM */ - /* begin mapFor:performUntil:arg: */ mcpc = (((sqInt)cogMethod)) + cmNoCheckEntryOffset; map = ((((usqInt)cogMethod)) + ((cogMethod->blockSize))) - 1; @@ -7622,13 +7628,9 @@ markAndTraceLiteralinat((cogMethod->selector), cogMethod, (&((cogMethod->selector)))); maybeMarkCountersIn(cogMethod); /* begin maybeMarkIRCsIn: */ - -# if NewspeakVM markIfIRC((cogMethod->nextMethodOrIRCs)); -# endif /* NewspeakVM */ - /* begin mapFor:performUntil:arg: */ mcpc1 = (((sqInt)cogMethod)) + cmNoCheckEntryOffset; map1 = ((((usqInt)cogMethod)) + ((cogMethod->blockSize))) - 1; @@ -7730,13 +7732,9 @@ markAndTraceLiteralinat((cogMethod->selector), cogMethod, (&((cogMethod->selector)))); maybeMarkCountersIn(cogMethod); /* begin maybeMarkIRCsIn: */ - -# if NewspeakVM markIfIRC((cogMethod->nextMethodOrIRCs)); -# endif /* NewspeakVM */ - /* begin mapFor:performUntil:arg: */ mcpc = (((sqInt)cogMethod)) + cmNoCheckEntryOffset; map = ((((usqInt)cogMethod)) + ((cogMethod->blockSize))) - 1; @@ -8101,8 +8099,6 @@ { sqInt objOop; - -# if NewspeakVM indexOfIRC = (theIRCs = 0); if (numIRCs > 0) { assert((noAssertMethodClassAssociationOf(methodObj)) != (nilObject())); @@ -8115,11 +8111,6 @@ } return 1; -# else /* NewspeakVM */ - return 1; - -# endif /* NewspeakVM */ - } @@ -12779,7 +12770,7 @@ AbstractInstruction * jumpFixedFieldsOutOfBounds; AbstractInstruction *jumpHasFixedFields; AbstractInstruction *jumpImmediate; - sqInt jumpImmutable; + AbstractInstruction * jumpImmutable; AbstractInstruction *jumpIsBytes; AbstractInstruction * jumpIsCompiledMethod; AbstractInstruction *jumpIsContext; @@ -12801,7 +12792,6 @@ sqInt quickConstant5; sqInt quickConstant6; - jumpImmutable = 0; /* begin genLoadArgAtDepth:into: */ assert(1 < (numRegArgs())); /* begin genLoadArgAtDepth:into: */ @@ -14081,7 +14071,7 @@ AbstractInstruction *jumpBadIndex; AbstractInstruction *jumpBytesOutOfBounds; AbstractInstruction *jumpBytesOutOfRange; - sqInt jumpImmutable; + AbstractInstruction * jumpImmutable; AbstractInstruction *jumpIsBytes; AbstractInstruction * jumpIsCompiledMethod; AbstractInstruction *jumpIsShorts; @@ -14096,7 +14086,6 @@ sqInt quickConstant3; sqInt quickConstant4; - jumpImmutable = 0; /* begin genLoadArgAtDepth:into: */ assert(1 < (numRegArgs())); /* begin genLoadArgAtDepth:into: */ @@ -14736,8 +14725,6 @@ static void generateObjectRepresentationTrampolines(void) { - sqInt ceCannotAssignToWithIndexTrampoline; - # if IMMUTABILITY @@ -15297,6 +15284,46 @@ return 0; } + +/* baseHeader holds at least the least significant 32 bits of the object */ + + /* CogObjectRepresentationForSpur>>#genJumpBaseHeaderImmutable: */ +#if IMMUTABILITY +static AbstractInstruction * NoDbgRegParms +genJumpBaseHeaderImmutable(sqInt baseHeaderReg) +{ + AbstractInstruction *anInstruction; + sqInt quickConstant; + + /* begin TstCq:R: */ + quickConstant = immutableBitMask(); + /* begin gen:quickConstant:operand: */ + anInstruction = genoperandoperand(TstCqR, quickConstant, baseHeaderReg); + /* begin JumpNonZero: */ + return genConditionalBranchoperand(JumpNonZero, ((sqInt)0)); +} +#endif /* IMMUTABILITY */ + + +/* baseHeader holds at least the least significant 32 bits of the object */ + + /* CogObjectRepresentationForSpur>>#genJumpBaseHeaderMutable: */ +#if IMMUTABILITY +static AbstractInstruction * NoDbgRegParms +genJumpBaseHeaderMutable(sqInt baseHeaderReg) +{ + AbstractInstruction *anInstruction; + sqInt quickConstant; + + /* begin TstCq:R: */ + quickConstant = immutableBitMask(); + /* begin gen:quickConstant:operand: */ + anInstruction = genoperandoperand(TstCqR, quickConstant, baseHeaderReg); + /* begin JumpZero: */ + return genConditionalBranchoperand(JumpZero, ((sqInt)0)); +} +#endif /* IMMUTABILITY */ + /* CogObjectRepresentationForSpur>>#genJumpImmediate: */ static AbstractInstruction * NoDbgRegParms genJumpImmediate(sqInt aRegister) @@ -15312,7 +15339,20 @@ return genConditionalBranchoperand(JumpNonZero, ((sqInt)0)); } + /* CogObjectRepresentationForSpur>>#genJumpMutable:scratchReg: */ +#if IMMUTABILITY +static AbstractInstruction * NoDbgRegParms +genJumpMutablescratchReg(sqInt sourceReg, sqInt scratchReg) +{ + AbstractInstruction *anInstruction; + /* begin MoveMw:r:R: */ + anInstruction = genoperandoperandoperand(MoveMwrR, 0, sourceReg, scratchReg); + return genJumpBaseHeaderMutable(scratchReg); +} +#endif /* IMMUTABILITY */ + + /* Generate a call to code that allocates a new Array of size. The Array should be initialized with nils iff initialized is true. The size arg is passed in SendNumArgsReg, the result @@ -23829,12 +23869,8 @@ blockStart = blockStartAt(compiledBlocksCount); scanBlock(blockStart); initialOpcodeIndex = opcodeIndex; - -# if NewspeakVM initialIndexOfIRC = indexOfIRC; -# endif /* NewspeakVM */ - while (1) { compileBlockEntry(blockStart); initialStackPtr = simStackPtr; @@ -23849,12 +23885,8 @@ bzero(abstractOpcodes + initialOpcodeIndex, (opcodeIndex - initialOpcodeIndex) * sizeof(AbstractInstruction)); opcodeIndex = initialOpcodeIndex; - -# if NewspeakVM indexOfIRC = initialIndexOfIRC; -# endif /* NewspeakVM */ - } compiledBlocksCount += 1; } @@ -24185,15 +24217,11 @@ } /* begin annotateBytecode: */ (stackCheckLabel->annotation = HasBytecodePC); - -# if NewspeakVM if (numIRCs > 0) { /* begin PrefetchAw: */ anInstruction2 = genoperand(PrefetchAw, theIRCs); } -# endif /* NewspeakVM */ - initSimStackForFramefulMethod(initialPC); } @@ -26197,13 +26225,17 @@ genStorePopLiteralVariable(sqInt popBoolean, sqInt litVarIndex) { AbstractInstruction *abstractInstruction; + AbstractInstruction *abstractInstruction1; + AbstractInstruction *abstractInstruction2; AbstractInstruction *anInstruction; + AbstractInstruction *anInstruction1; sqInt association; - sqInt immutabilityFailure; + AbstractInstruction *fail; + AbstractInstruction * immutabilityFailure; + AbstractInstruction *mutableJump; sqInt needStoreCheck; sqInt topReg; - immutabilityFailure = 0; assert(needsFrame); # if IMMUTABILITY @@ -26230,8 +26262,26 @@ topReg = ClassReg; ssStoreAndReplacePoptoReg(popBoolean, ClassReg); ssFlushTo(simStackPtr); - immutabilityFailure = genImmutableCheckslotIndexsourceRegscratchRegneedRestoreRcvr(ReceiverResultReg, ValueIndex, ClassReg, TempReg, 0); + /* begin genImmutableCheck:slotIndex:sourceReg:scratchReg:needRestoreRcvr: */ + assert(ReceiverResultReg == ReceiverResultReg); + assert(TempReg == TempReg); + assert(ClassReg == ClassReg); + /* We reach this code if the object mutated is immutable. */ + mutableJump = genJumpMutablescratchReg(ReceiverResultReg, TempReg); + /* begin MoveCq:R: */ + anInstruction1 = genoperandoperand(MoveCqR, ValueIndex, TempReg); + /* begin CallRT: */ + abstractInstruction1 = genoperand(Call, ceCannotAssignToWithIndexTrampoline); + (abstractInstruction1->annotation = IsRelativeCall); + /* begin annotateBytecode: */ + abstractInstruction2 = genoperandoperand(Label, (labelCounter += 1), bytecodePC); + (abstractInstruction2->annotation = HasBytecodePC); + /* begin Jump: */ + fail = genoperand(Jump, ((sqInt)0)); + jmpTarget(mutableJump, gLabel()); + immutabilityFailure = fail; + # else /* IMMUTABILITY */ topReg = allocateRegForStackEntryAtnotConflictingWith(0, registerMaskFor(ReceiverResultReg)); ssStorePoptoReg(popBoolean, topReg); @@ -26261,17 +26311,21 @@ { AbstractInstruction *abstractInstruction; AbstractInstruction *abstractInstruction1; + AbstractInstruction *abstractInstruction11; + AbstractInstruction *abstractInstruction2; AbstractInstruction *anInstruction; - sqInt immutabilityFailure; + AbstractInstruction *anInstruction1; + AbstractInstruction *fail; + AbstractInstruction * immutabilityFailure; AbstractInstruction *jmpDone; AbstractInstruction *jmpSingle; + AbstractInstruction *mutableJump; sqInt needStoreCheck; /* The reason we need a frame here is that assigning to an inst var of a context may involve wholesale reorganization of stack pages, and the only way to preserve the execution state of an activation in that case is if it has a frame. */ - immutabilityFailure = 0; assert(needsFrame); # if IMMUTABILITY @@ -26318,8 +26372,29 @@ } # if IMMUTABILITY - immutabilityFailure = genImmutableCheckslotIndexsourceRegscratchRegneedRestoreRcvr(ReceiverResultReg, ValueIndex, ClassReg, TempReg, 1); + /* begin genImmutableCheck:slotIndex:sourceReg:scratchReg:needRestoreRcvr: */ + assert(ReceiverResultReg == ReceiverResultReg); + assert(TempReg == TempReg); + assert(ClassReg == ClassReg); + /* We reach this code if the object mutated is immutable. */ + mutableJump = genJumpMutablescratchReg(ReceiverResultReg, TempReg); + /* begin MoveCq:R: */ + anInstruction1 = genoperandoperand(MoveCqR, ValueIndex, TempReg); + /* begin CallRT: */ + abstractInstruction11 = genoperand(Call, ceCannotAssignToWithIndexTrampoline); + (abstractInstruction11->annotation = IsRelativeCall); + /* begin annotateBytecode: */ + abstractInstruction2 = genoperandoperand(Label, (labelCounter += 1), bytecodePC); + (abstractInstruction2->annotation = HasBytecodePC); + /* begin putSelfInReceiverResultReg */ + storeToReg((&simSelf), ReceiverResultReg); + + /* begin Jump: */ + fail = genoperand(Jump, ((sqInt)0)); + jmpTarget(mutableJump, gLabel()); + immutabilityFailure = fail; + # endif /* IMMUTABILITY */ genStoreSourceRegslotIndexdestRegscratchReginFrameneedsStoreCheck(ClassReg, slotIndex, ReceiverResultReg, TempReg, 1, needStoreCheck); @@ -26339,11 +26414,15 @@ { AbstractInstruction *abstractInstruction; AbstractInstruction *abstractInstruction1; - sqInt immutabilityFailure; + AbstractInstruction *abstractInstruction11; + AbstractInstruction *abstractInstruction2; + AbstractInstruction *anInstruction; + AbstractInstruction *fail; + AbstractInstruction * immutabilityFailure; + AbstractInstruction *mutableJump; sqInt needStoreCheck; sqInt topReg; - immutabilityFailure = 0; # if IMMUTABILITY assert(needsFrame); @@ -26362,8 +26441,29 @@ topReg = ClassReg; ssStoreAndReplacePoptoReg(popBoolean, ClassReg); ssFlushTo(simStackPtr); - immutabilityFailure = genImmutableCheckslotIndexsourceRegscratchRegneedRestoreRcvr(ReceiverResultReg, slotIndex, ClassReg, TempReg, 1); + /* begin genImmutableCheck:slotIndex:sourceReg:scratchReg:needRestoreRcvr: */ + assert(ReceiverResultReg == ReceiverResultReg); + assert(TempReg == TempReg); + assert(ClassReg == ClassReg); + /* We reach this code if the object mutated is immutable. */ + mutableJump = genJumpMutablescratchReg(ReceiverResultReg, TempReg); + /* begin MoveCq:R: */ + anInstruction = genoperandoperand(MoveCqR, slotIndex, TempReg); + /* begin CallRT: */ + abstractInstruction11 = genoperand(Call, ceCannotAssignToWithIndexTrampoline); + (abstractInstruction11->annotation = IsRelativeCall); + /* begin annotateBytecode: */ + abstractInstruction2 = genoperandoperand(Label, (labelCounter += 1), bytecodePC); + (abstractInstruction2->annotation = HasBytecodePC); + /* begin putSelfInReceiverResultReg */ + storeToReg((&simSelf), ReceiverResultReg); + + /* begin Jump: */ + fail = genoperand(Jump, ((sqInt)0)); + jmpTarget(mutableJump, gLabel()); + immutabilityFailure = fail; + # else /* IMMUTABILITY */ topReg = allocateRegForStackEntryAtnotConflictingWith(0, registerMaskFor(ReceiverResultReg)); ssStorePoptoReg(popBoolean, topReg); @@ -27088,12 +27188,8 @@ needsFrame = 0; inBlock = 0; prevBCDescriptor = null; - -# if NewspeakVM numIRCs = 0; -# endif /* NewspeakVM */ - if ((primitiveIndex > 0) && (isQuickPrimitiveIndex(primitiveIndex))) { return 0; @@ -27141,14 +27237,10 @@ targetPC = (pc + ((descriptor->numBytes))) + distance; latestContinuation = ((latestContinuation < targetPC) ? targetPC : latestContinuation); } - -# if NewspeakVM if ((descriptor->hasIRC)) { numIRCs += 1; } -# endif /* NewspeakVM */ - pc += (descriptor->numBytes); if ((descriptor->isExtension)) { nExts += 1; Modified: branches/Cog/nsspur64src/vm/cointerp.c =================================================================== --- branches/Cog/nsspur64src/vm/cointerp.c 2016-02-12 19:45:55 UTC (rev 3590) +++ branches/Cog/nsspur64src/vm/cointerp.c 2016-02-13 03:33:43 UTC (rev 3591) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1670 uuid: 6ba2dd3d-ab44-468e-9184-1c85580f980b + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1677 uuid: 7056bb77-6aa0-4cb6-aa6c-cd921c231d37 from - CoInterpreter VMMaker.oscog-eem.1670 uuid: 6ba2dd3d-ab44-468e-9184-1c85580f980b + CoInterpreter VMMaker.oscog-eem.1677 uuid: 7056bb77-6aa0-4cb6-aa6c-cd921c231d37 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1670 uuid: 6ba2dd3d-ab44-468e-9184-1c85580f980b " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1677 uuid: 7056bb77-6aa0-4cb6-aa6c-cd921c231d37 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -220,7 +220,7 @@ #define EncounteredUnknownBytecode -6 #define EndOfRun 0x101 #if !defined(EnforceAccessControl) /* Allow this to be overridden on the compiler command line */ -#define EnforceAccessControl 1 +# define EnforceAccessControl 1 #endif #define ExcessSignalsIndex 2 #define ExternalObjectsArray 38 @@ -247,7 +247,7 @@ #define HeaderIndex 0 #define IFrameSlots 7 #if !defined(IMMUTABILITY) /* Allow this to be overridden on the compiler command line */ -#define IMMUTABILITY 0 +# define IMMUTABILITY 0 #endif #define InstanceSpecificationIndex 2 #define InstructionPointerIndex 1 @@ -355,6 +355,7 @@ #define ReturnToInterpreter 1 #define SchedulerAssociation 3 #define SelectorAboutToReturn 48 +#define SelectorAttemptToAssign 50 #define SelectorCannotInterpret 34 #define SelectorCannotReturn 21 #define SelectorDoesNotUnderstand 20 @@ -404,7 +405,7 @@ #define V3PrimitiveBitsMask 0x80000FF8ULL #define ValueIndex 1 #if !defined(VMBIGENDIAN) /* Allow this to be overridden on the compiler command line */ -#define VMBIGENDIAN 0 +# define VMBIGENDIAN 0 #endif #define WeaklingStackRootIndex 0x1001 #define XIndex 0 @@ -457,6 +458,9 @@ static void NoDbgRegParms callRegisterArgCogMethodatreceiver(CogMethod *cogMethod, sqInt entryOffset, sqInt rcvr); extern void ceActivateFailingPrimitiveMethod(sqInt aPrimitiveMethod); extern sqInt ceBaseFrameReturn(sqInt returnValue); +#if IMMUTABILITY +extern sqInt ceCannotAssignTowithIndexvalueToAssign(sqInt immutableObject, sqInt index, sqInt valueToAssign); +#endif /* IMMUTABILITY */ extern sqInt ceCannotResume(void); extern sqInt ceCheckForAndFollowForwardedPrimitiveState(void); extern void ceCheckForInterrupts(void); @@ -649,6 +653,9 @@ static void unmarkAllFrames(void); static void NoDbgRegParms initializeStacknumSlotspageSize(char *theStackPages, sqInt stackSlots, sqInt slotsPerPage); static sqInt NoDbgRegParms pageIndexFor(void *pointer); +#if IMMUTABILITY +static sqInt NoDbgRegParms canBeImmutable(sqInt oop); +#endif /* IMMUTABILITY */ extern char * cStringOrNullFor(sqInt oop); extern sqInt failed(void); static sqInt NoDbgRegParms isNegativeIntegerValueOf(sqInt oop); @@ -729,6 +736,7 @@ static void primitiveFormPrint(void); static void primitiveFractionalPart(void); static void primitiveGetAttribute(void); +static void primitiveGetImmutability(void); EXPORT(sqInt) primitiveGetLogDirectory(void); static void primitiveGetNextEvent(void); EXPORT(sqInt) primitiveGetWindowLabel(void); @@ -805,6 +813,7 @@ static void primitiveSecondsClock(void); static void primitiveSetDisplayMode(void); static void primitiveSetFullScreen(void); +static void primitiveSetImmutability(void); static void primitiveSetInterruptKey(void); EXPORT(sqInt) primitiveSetLogDirectory(void); static void primitiveSetOrHasIdentityHash(void); @@ -1061,6 +1070,9 @@ static usqLong NoDbgRegParms headerForSlotshashformatclassIndex(sqInt numSlots, sqInt hash, sqInt formatField, sqInt classIndex); static sqInt hiddenRootSlots(void); static sqInt imageSegmentVersion(void); +#if IMMUTABILITY +extern sqInt immutableBitMask(void); +#endif /* IMMUTABILITY */ extern void incrementalGC(void); static void NoDbgRegParms inFreeTreeReplacewith(sqInt treeNode, sqInt newNode); static sqInt NoDbgRegParms initialInstanceOf(sqInt classObj); @@ -1604,8 +1616,8 @@ _iss sqInt argumentCount; _iss sqInt specialObjectsOop; _iss sqInt bytecodeSetSelector; +_iss sqInt messageSelector; _iss usqInt instructionPointer; -_iss sqInt messageSelector; _iss usqInt newMethod; _iss usqInt freeStart; _iss sqInt markStack; @@ -1614,8 +1626,8 @@ _iss usqInt newSpaceLimit; _iss char * stackBasePlus1; _iss sqInt weaklingStack; +_iss sqInt trueObj; _iss usqInt newSpaceStart; -_iss sqInt trueObj; _iss sqInt falseObj; _iss sqInt hiddenRootsObj; _iss SpurSegmentInfo * segments; @@ -1984,8 +1996,8 @@ /* 160 */ primitiveAdoptInstance, /* 161 */ primitiveSetOrHasIdentityHash, /* 162 */ (void (*)(void))0, - /* 163 */ (void (*)(void))0, - /* 164 */ (void (*)(void))0, + /* 163 */ primitiveGetImmutability, + /* 164 */ primitiveSetImmutability, /* 165 */ primitiveIntegerAt, /* 166 */ primitiveIntegerAtPut, /* 167 */ primitiveYield, @@ -2407,7 +2419,7 @@ /*100*/ 1, 1, 0, 2,-1, 1,-1,-1,-1,-1, 0, 0,-1,-1,-1, 1, 1,-1, 1, 0, /*120*/ -1, 0,-1,-1, 0, 0, 0, 0, 0,-1,-1,-1, 1, 0, 0,-1, 0,-1,-1,-1, /*140*/ -1, 1,-1, 1, 0, 0,-1,-1, 0, 0,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, -/*160*/ 0, 0,-1,-1,-1, 1, 1,-1, 1, 0, 0, 1,-1, 1, 1,-1,-1,-1,-1,-1, +/*160*/ 0, 0,-1, 0, 0, 1, 1,-1, 1, 0, 0, 1,-1, 1, 1,-1,-1,-1,-1,-1, /*180*/ 0,-1,-1, 0, 0, 0, 1, 1, 1, 0,-1,-1,-1,-1,-1, 1, 2,-1,-1,-1, /*200*/ -1, 2, 2, 2, 2, 2, 2,-1,-1,-1, 1, 1, 1, 1,-1, 1,-1,-1, 3,-1, /*220*/ -1, 2, 2,-1,-1,-1,-1,-1,-1,-1, 0,-1, 2, 0,-1,-1,-1,-1,-1,-1, @@ -2430,7 +2442,7 @@ /*560*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 0, 0, 0,-1,-1 }; char expensiveAsserts = 0; -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.1670"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.1677"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -4770,7 +4782,16 @@ # if IMMUTABILITY assert(!((isImmediate(rcvr)))); if (((((usqInt) (longAt(rcvr))) >> 23) & 1) != 0) { - cannotAssigntowithIndex(top, rcvr, instVarIndex); + /* begin cannotAssign:to:withIndex: */ + longAtPointerput((localSP -= BytesPerOop), rcvr); + /* begin internalPush: */ + longAtPointerput((localSP -= BytesPerOop), top); + /* begin internalPush: */ + longAtPointerput((localSP -= BytesPerOop), (((instVarIndex + 1) << 3) | 1)); + GIV(messageSelector) = longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (((long)SelectorAttemptToAssign) << (shiftForWord()))); + GIV(argumentCount) = 2; + goto normalSend; + /* return self */ goto l1; } @@ -5758,7 +5779,16 @@ # if IMMUTABILITY assert(!((isImmediate(objOop)))); if (((((usqInt) (longAt(objOop))) >> 23) & 1) != 0) { - cannotAssigntowithIndex(value, objOop, variableIndex); + /* begin cannotAssign:to:withIndex: */ + longAtPointerput((localSP -= BytesPerOop), objOop); + /* begin internalPush: */ + longAtPointerput((localSP -= BytesPerOop), value); + /* begin internalPush: */ + longAtPointerput((localSP -= BytesPerOop), (((variableIndex + 1) << 3) | 1)); + GIV(messageSelector) = longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (((long)SelectorAttemptToAssign) << (shiftForWord()))); + GIV(argumentCount) = 2; + goto normalSend; + /* return self */ goto l4; } @@ -5815,7 +5845,15 @@ # if IMMUTABILITY assert(!((isImmediate(litVar)))); if (((((usqInt) (longAt(litVar))) >> 23) & 1) != 0) { - cannotAssigntowithIndex(value, litVar, ValueIndex); + /* begin cannotAssign:to:withIndex: */ + longAtPointerput((localSP -= BytesPerOop), litVar); + /* begin internalPush: */ + longAtPointerput((localSP -= BytesPerOop), value); + /* begin internalPush: */ + longAtPointerput((localSP -= BytesPerOop), (((ValueIndex + 1) << 3) | 1)); + GIV(messageSelector) = longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (((long)SelectorAttemptToAssign) << (shiftForWord()))); + GIV(argumentCount) = 2; + goto normalSend; goto l5; } @@ -5873,7 +5911,16 @@ # if IMMUTABILITY assert(!((isImmediate(objOop)))); if (((((usqInt) (longAt(objOop))) >> 23) & 1) != 0) { - cannotAssigntowithIndex(value, objOop, variableIndex); + /* begin cannotAssign:to:withIndex: */ + longAtPointerput((localSP -= BytesPerOop), objOop); + /* begin internalPush: */ + longAtPointerput((localSP -= BytesPerOop), value); + /* begin internalPush: */ + longAtPointerput((localSP -= BytesPerOop), (((variableIndex + 1) << 3) | 1)); + GIV(messageSelector) = longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (((long)SelectorAttemptToAssign) << (shiftForWord()))); + GIV(argumentCount) = 2; + goto normalSend; + /* return self */ goto l7; } @@ -5930,7 +5977,15 @@ # if IMMUTABILITY assert(!((isImmediate(litVar)))); if (((((usqInt) (longAt(litVar))) >> 23) & 1) != 0) { - cannotAssigntowithIndex(value, litVar, ValueIndex); + /* begin cannotAssign:to:withIndex: */ + longAtPointerput((localSP -= BytesPerOop), litVar); + /* begin internalPush: */ + longAtPointerput((localSP -= BytesPerOop), value); + /* begin internalPush: */ + longAtPointerput((localSP -= BytesPerOop), (((ValueIndex + 1) << 3) | 1)); + GIV(messageSelector) = longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (((long)SelectorAttemptToAssign) << (shiftForWord()))); + GIV(argumentCount) = 2; + goto normalSend; goto l8; } @@ -6584,7 +6639,15 @@ # if IMMUTABILITY assert(!((isImmediate(litVar)))); if (((((usqInt) (longAt(litVar))) >> 23) & 1) != 0) { - cannotAssigntowithIndex(top, litVar, ValueIndex); + /* begin cannotAssign:to:withIndex: */ + longAtPointerput((localSP -= BytesPerOop), litVar); + /* begin internalPush: */ + longAtPointerput((localSP -= BytesPerOop), top); + /* begin internalPush: */ + longAtPointerput((localSP -= BytesPerOop), (((ValueIndex + 1) << 3) | 1)); + GIV(messageSelector) = longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (((long)SelectorAttemptToAssign) << (shiftForWord()))); + GIV(argumentCount) = 2; + goto normalSend; goto l14; } @@ -6714,7 +6777,16 @@ # if IMMUTABILITY assert(!((isImmediate(rcvr1)))); if (((((usqInt) (longAt(rcvr1))) >> 23) & 1) != 0) { - cannotAssigntowithIndex(top, rcvr1, byte3); + /* begin cannotAssign:to:withIndex: */ + longAtPointerput((localSP -= BytesPerOop), rcvr1); + /* begin internalPush: */ + longAtPointerput((localSP -= BytesPerOop), top); + /* begin internalPush: */ + longAtPointerput((localSP -= BytesPerOop), (((byte3 + 1) << 3) | 1)); + GIV(messageSelector) = longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (((long)SelectorAttemptToAssign) << (shiftForWord()))); + GIV(argumentCount) = 2; + goto normalSend; + /* return self */ goto l11; } @@ -11916,7 +11988,16 @@ # if IMMUTABILITY assert(!((isImmediate(rcvr)))); if (((((usqInt) (longAt(rcvr))) >> 23) & 1) != 0) { - cannotAssigntowithIndex(top, rcvr, instVarIndex); + /* begin cannotAssign:to:withIndex: */ + longAtPointerput((localSP -= BytesPerOop), rcvr); + /* begin internalPush: */ + longAtPointerput((localSP -= BytesPerOop), top); + /* begin internalPush: */ + longAtPointerput((localSP -= BytesPerOop), (((instVarIndex + 1) << 3) | 1)); + GIV(messageSelector) = longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (((long)SelectorAttemptToAssign) << (shiftForWord()))); + GIV(argumentCount) = 2; + goto normalSend; + /* return self */ goto l125; } @@ -12497,7 +12578,16 @@ # if IMMUTABILITY assert(!((isImmediate(rcvr)))); if (((((usqInt) (longAt(rcvr))) >> 23) & 1) != 0) { - cannotAssigntowithIndex(anObject, rcvr, variableIndex); + /* begin cannotAssign:to:withIndex: */ + longAtPointerput((localSP -= BytesPerOop), rcvr); + /* begin internalPush: */ + longAtPointerput((localSP -= BytesPerOop), anObject); + /* begin internalPush: */ + longAtPointerput((localSP -= BytesPerOop), (((variableIndex + 1) << 3) | 1)); + GIV(messageSelector) = longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (((long)SelectorAttemptToAssign) << (shiftForWord()))); + GIV(argumentCount) = 2; + goto normalSend; + /* return self */ goto l132; } @@ -12527,6 +12617,7 @@ case 489: /*233*/ /* extStoreLiteralVariableBytecode */ { + sqInt anObject; sqInt litVar; sqInt referent; sqInt variableIndex; @@ -12535,6 +12626,8 @@ variableIndex = (byteAtPointer(++localIP)) + (((long)extA) << 8); extA = 0; /* begin storeLiteralVariable:withValue: */ + anObject = longAtPointer(localSP); + /* begin literal: */ assert(GIV(method) == (iframeMethod(localFP))); litVar = longAt((GIV(method) + BaseHeaderSize) + (((long)(variableIndex + LiteralStart)) << (shiftForWord()))); if (((longAt(litVar)) & ((classIndexMask()) - (isForwardedObjectClassIndexPun()))) == 0) { @@ -12552,7 +12645,15 @@ # if IMMUTABILITY assert(!((isImmediate(litVar)))); if (((((usqInt) (longAt(litVar))) >> 23) & 1) != 0) { - cannotAssigntowithIndex(longAtPointer(localSP), litVar, ValueIndex); + /* begin cannotAssign:to:withIndex: */ + longAtPointerput((localSP -= BytesPerOop), litVar); + /* begin internalPush: */ + longAtPointerput((localSP -= BytesPerOop), anObject); + /* begin internalPush: */ + longAtPointerput((localSP -= BytesPerOop), (((ValueIndex + 1) << 3) | 1)); + GIV(messageSelector) = longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (((long)SelectorAttemptToAssign) << (shiftForWord()))); + GIV(argumentCount) = 2; + goto normalSend; goto l134; } @@ -12563,15 +12664,15 @@ if (isOldObject(litVar)) { /* most stores into young objects */ - if ((((longAtPointer(localSP)) & (tagMask())) == 0) - && (oopisLessThan(longAtPointer(localSP), GIV(newSpaceLimit)))) { + if (((anObject & (tagMask())) == 0) + && (oopisLessThan(anObject, GIV(newSpaceLimit)))) { /* begin possibleRootStoreInto: */ if (!(((((usqInt) (longAt(litVar))) >> (rememberedBitShift())) & 1) != 0)) { remember(litVar); } } } - longAtput((litVar + BaseHeaderSize) + (((long)ValueIndex) << (shiftForWord())), longAtPointer(localSP)); + longAtput((litVar + BaseHeaderSize) + (((long)ValueIndex) << (shiftForWord())), anObject); l134: /* end storeLiteralVariable:withValue: */; /* begin fetchNextBytecode */ currentBytecode = (byteAtPointer(++localIP)) + GIV(bytecodeSetSelector); @@ -12715,7 +12816,16 @@ # if IMMUTABILITY assert(!((isImmediate(rcvr)))); if (((((usqInt) (longAt(rcvr))) >> 23) & 1) != 0) { - cannotAssigntowithIndex(value, rcvr, variableIndex); + /* begin cannotAssign:to:withIndex: */ + longAtPointerput((localSP -= BytesPerOop), rcvr); + /* begin internalPush: */ + longAtPointerput((localSP -= BytesPerOop), value); + /* begin internalPush: */ + longAtPointerput((localSP -= BytesPerOop), (((variableIndex + 1) << 3) | 1)); + GIV(messageSelector) = longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (((long)SelectorAttemptToAssign) << (shiftForWord()))); + GIV(argumentCount) = 2; + goto normalSend; + /* return self */ goto l135; } @@ -12774,7 +12884,15 @@ # if IMMUTABILITY assert(!((isImmediate(litVar)))); if (((((usqInt) (longAt(litVar))) >> 23) & 1) != 0) { - cannotAssigntowithIndex(value, litVar, ValueIndex); + /* begin cannotAssign:to:withIndex: */ + longAtPointerput((localSP -= BytesPerOop), litVar); + /* begin internalPush: */ + longAtPointerput((localSP -= BytesPerOop), value); + /* begin internalPush: */ + longAtPointerput((localSP -= BytesPerOop), (((ValueIndex + 1) << 3) | 1)); + GIV(messageSelector) = longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (((long)SelectorAttemptToAssign) << (shiftForWord()))); + GIV(argumentCount) = 2; + goto normalSend; goto l137; } @@ -15882,6 +16000,40 @@ } +/* index is unboxed. */ + + /* CoInterpreter>>#ceCannotAssignTo:withIndex:valueToAssign: */ +#if IMMUTABILITY +sqInt +ceCannotAssignTowithIndexvalueToAssign(sqInt immutableObject, sqInt index, sqInt valueToAssign) +{ DECL_MAYBE_SQ_GLOBAL_STRUCT + char *sp; + char *sp1; + char *sp2; + char *sp3; + sqInt top; + + /* begin popStack */ + top = longAt(GIV(stackPointer)); + GIV(stackPointer) += BytesPerWord; + GIV(instructionPointer) = top; + /* begin push: */ + longAtput((sp = GIV(stackPointer) - BytesPerWord), immutableObject); + GIV(stackPointer) = sp; + /* begin push: */ + longAtput((sp1 = GIV(stackPointer) - BytesPerWord), valueToAssign); + GIV(stackPointer) = sp1; + /* begin push: */ + longAtput((sp2 = GIV(stackPointer) - BytesPerWord), ((index << 3) | 1)); + GIV(stackPointer) = sp2; + /* begin push: */ + longAtput((sp3 = GIV(stackPointer) - BytesPerWord), GIV(instructionPointer)); + GIV(stackPointer) = sp3; + return ceSendAborttonumArgs(longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (((long)SelectorAttemptToAssign) << (shiftForWord()))), immutableObject, 2); +} +#endif /* IMMUTABILITY */ + + /* A context that has been returned from, or otherwise has an invalid pc has been reentered. Until we have a cannotResume: selector, simply resend cannotReturn:. */ @@ -18736,15 +18888,8 @@ fieldIndex1 = classTag & ((1LL << (classTableMajorIndexShift())) - 1); GIV(lkupClass) = longAt((classTablePage + BaseHeaderSize) + (((long)fieldIndex1) << (shiftForWord()))); l1: /* end classAtIndex: */; - -# if NewspeakVM lookupOrdinarySend(); -# else /* NewspeakVM */ - lookupMethodInClass(GIV(lkupClass)); - -# endif /* NewspeakVM */ - addNewMethodToCache(GIV(lkupClass)); } } @@ -19760,8 +19905,6 @@ else { classTag = (longAt(rcvr)) & (classIndexMask()); } - -# if NewspeakVM /* begin inlineLookupInNSMethodCacheSel:classTag:method:lookupRule: */ hash = (selector ^ classTag) ^ (0 ^ LookupRuleMNU); @@ -19804,11 +19947,6 @@ inCache = 0; l1: /* end inlineLookupInNSMethodCacheSel:classTag:method:lookupRule: */; -# else /* NewspeakVM */ - inCache = lookupInMethodCacheSelclassTag(selector, classTag); - -# endif /* NewspeakVM */ - if (!inCache) { GIV(messageSelector) = selector; erridx = lookupMNUInClass(classAtIndex(classTag)); @@ -28587,7 +28725,42 @@ return pageIndexForstackBasePlus1bytesPerPage(pointer, GIV(stackBasePlus1), GIV(bytesPerPage)); } + /* InterpreterPrimitives>>#canBeImmutable: */ +#if IMMUTABILITY +static sqInt NoDbgRegParms +canBeImmutable(sqInt oop) +{ DECL_MAYBE_SQ_GLOBAL_STRUCT + sqInt processLists; + sqInt scheduler; + assert(isNonImmediate(oop)); + if (((oop & (tagMask())) == 0) + && (((longAt(oop)) & (classIndexMask())) == ClassMethodContextCompactIndex)) { + return 0; + } + if (((longAt(oop)) & (classIndexMask())) == (rawHashBitsOf(longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (((long)ClassSemaphore) << (shiftForWord())))))) { + return 0; + } + /* begin fetchPointer:ofObject: */ + scheduler = longAt(((longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (((long)SchedulerAssociation) << (shiftForWord())))) + BaseHeaderSize) + (((long)ValueIndex) << (shiftForWord()))); + processLists = longAt((scheduler + BaseHeaderSize) + (((long)ProcessListsIndex) << (shiftForWord()))); + if (oop == scheduler) { + return 0; + } + if (oop == processLists) { + return 0; + } + if ((classIndexOf(longAt((processLists + BaseHeaderSize) + (1LL << (shiftForWord()))))) == ((longAt(oop)) & (classIndexMask()))) { + return 0; + } + if ((classIndexOf(longAt((scheduler + BaseHeaderSize) + (((long)ActiveProcessIndex) << (shiftForWord()))))) == ((longAt(oop)) & (classIndexMask()))) { + return 0; + } + return 1; +} +#endif /* IMMUTABILITY */ + + /* Answer either a malloced string with the null-terminated contents of oop if oop is a string, or the null pointer if oop is nil, or fail. It is the client's @@ -34186,7 +34359,33 @@ } } + /* InterpreterPrimitives>>#primitiveGetImmutability */ +static void +primitiveGetImmutability(void) +{ DECL_MAYBE_SQ_GLOBAL_STRUCT + sqInt rcvr; + char *sp; + sqInt trueOrFalse; + +# if IMMUTABILITY + rcvr = longAt(GIV(stackPointer) + (0 * BytesPerWord)); + /* begin pop:thenPushBool: */ + trueOrFalse = ((rcvr & (tagMask())) != 0) + || (((((usqInt) (longAt(rcvr))) >> 23) & 1) != 0); + longAtput((sp = GIV(stackPointer) + (((GIV(argumentCount) + 1) - 1) * BytesPerWord)), (trueOrFalse + ? GIV(trueObj) + : GIV(falseObj))); + GIV(stackPointer) = sp; + +# else /* IMMUTABILITY */ + GIV(primFailCode) = PrimErrUnsupported; + +# endif /* IMMUTABILITY */ + +} + + /* Primitive. Answer the VM's current log directory */ /* InterpreterPrimitives>>#primitiveGetLogDirectory */ @@ -38383,7 +38582,60 @@ } } + /* InterpreterPrimitives>>#primitiveSetImmutability */ +static void +primitiveSetImmutability(void) +{ DECL_MAYBE_SQ_GLOBAL_STRUCT + sqInt rcvr; + char *sp; + sqInt wasImmutable; + +# if IMMUTABILITY + rcvr = longAt(GIV(stackPointer) + (1 * BytesPerWord)); + if ((rcvr & (tagMask())) != 0) { + (GIV(primFailCode) = PrimErrBadReceiver); + return; + } + wasImmutable = +# if IMMUTABILITY + ((((usqInt) (longAt(rcvr))) >> 23) & 1) != 0 +# else /* IMMUTABILITY */ + 0 +# endif /* IMMUTABILITY */ + ; + if ((longAt(GIV(stackPointer))) == GIV(trueObj)) { + if (!(canBeImmutable(rcvr))) { + (GIV(primFailCode) = PrimErrInappropriate); + return; + } + /* begin setIsImmutableOf:to: */ + longAtput(rcvr, (longAt(rcvr)) | (1LL << 23)); + } + else { + if ((longAt(GIV(stackPointer))) == GIV(falseObj)) { + /* begin setIsImmutableOf:to: */ + longAtput(rcvr, (longAt(rcvr)) & (~(1LL << 23))); + } + else { + (GIV(primFailCode) = PrimErrBadArgument); + return; + } + } + /* begin pop:thenPushBool: */ + longAtput((sp = GIV(stackPointer) + (((GIV(argumentCount) + 1) - 1) * BytesPerWord)), (wasImmutable + ? GIV(trueObj) + : GIV(falseObj))); + GIV(stackPointer) = sp; + +# else /* IMMUTABILITY */ + GIV(primFailCode) = PrimErrUnsupported; + +# endif /* IMMUTABILITY */ + +} + + /* Set the user interrupt keycode. The keycode is an integer whose encoding is described in the comment for primitiveKbdNext. */ @@ -52154,6 +52406,18 @@ return (imageFormatVersion()) | (wholeWord & 0xFF000000ULL); } + +/* mask the immutable bit in the base header word */ + + /* SpurMemoryManager>>#immutableBitMask */ +#if IMMUTABILITY +sqInt +immutableBitMask(void) +{ + return 1LL << 23; +} +#endif /* IMMUTABILITY */ + /* SpurMemoryManager>>#incrementalGC */ void incrementalGC(void) @@ -61254,7 +61518,7 @@ usqInt prevFree; usqInt prevFreeChunk; @@ Diff output truncated at 50000 characters. @@

1 0

VM Maker: VMMaker.oscog-eem.1677.mcz
by commits＠source.squeak.org 13 Feb '16

13 Feb '16

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.1677.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.1677 Author: eem Time: 13 February 2016, 6:04:44.780067 pm UUID: 7056bb77-6aa0-4cb6-aa6c-cd921c231d37 Ancestors: VMMaker.oscog-eem.1676 Slang: Don't waste effort changing from symbols to strings when constructing TDefineNodes. Change the interpreter proxy function dereference code to use carriage-return-last necessitated by the new optional declaration of functions prototype generation introduced in VMMaker.oscog-eem.1675. =============== Diff against VMMaker.oscog-eem.1676 =============== Item was changed: ----- Method: CCodeGenerator>>addConstantForBinding: (in category 'public') ----- addConstantForBinding: variableBinding "Add the pool variable to the code base as a constant." | node val | val := variableBinding value. node := (useSymbolicConstants and: [self isCLiteral: val]) ifTrue:[TDefineNode new + setName: variableBinding key - setName: variableBinding key asString value: variableBinding value] ifFalse:[TConstantNode new setValue: variableBinding value]. + constants at: variableBinding key put: node! - constants at: variableBinding key asString put: node! Item was changed: ----- Method: CCodeGenerator>>addPoolVarsFor: (in category 'public') ----- addPoolVarsFor: aClass "Add the pool variables for the given class to the code base as constants." (aClass sharedPools reject: [:pool| pools includes: pool]) do: [:pool | pools add: pool. + pool bindingsDo: + [:binding | + self addConstantForBinding: binding]]! - pool bindingsDo: [:assoc | | val node | - val := assoc value. - node := (useSymbolicConstants and:[self isCLiteral: val]) - ifTrue:[TDefineNode new setName: assoc key asString value: assoc value] - ifFalse:[TConstantNode new setValue: assoc value]. - constants at: assoc key asString put: node]].! Item was changed: ----- Method: CCodeGenerator>>checkClassForNameConflicts: (in category 'error notification') ----- checkClassForNameConflicts: aClass "Verify that the given class does not have constant, variable, or method names that conflict with those of previously added classes. Raise an error if a conflict is found, otherwise just return." "check for constant name collisions in class pools" aClass classPool associationsDo: [:assoc | + (constants includesKey: assoc key) ifTrue: - (constants includesKey: assoc key asString) ifTrue: [self error: 'Constant ', assoc key, ' was defined in a previously added class']]. "and in shared pools" (aClass sharedPools reject: [:pool| pools includes: pool]) do: [:pool | pool bindingsDo: [:assoc | + (constants includesKey: assoc key) ifTrue: - (constants includesKey: assoc key asString) ifTrue: [self error: 'Constant ', assoc key, ' was defined in a previously added class']]]. "check for instance variable name collisions" (aClass inheritsFrom: VMStructType) ifFalse: [(self instVarNamesForClass: aClass) do: [:varName | (variables includes: varName) ifTrue: [self error: 'Instance variable ', varName, ' was defined in a previously added class']]]. "check for method name collisions" aClass selectors do: [:sel | | tmeth meth | ((self shouldIncludeMethodFor: aClass selector: sel) and: [(tmeth := methods at: sel ifAbsent: nil) notNil and: [(aClass isStructClass and: [(aClass isAccessor: sel) and: [(methods at: sel) isStructAccessor]]) not and: [(meth := aClass >> sel) isSubclassResponsibility not and: [(aClass includesBehavior: tmeth definingClass) not]]]]) ifTrue: [((aClass >>sel) pragmaAt: #option:) ifNil: [self error: 'Method ', sel, ' was defined in a previously added class.'] ifNotNil: [logger ensureCr; show: 'warning, method ', aClass name, '>>', sel storeString, ' overrides ', tmeth definingClass, '>>', sel storeString; cr]]]! Item was changed: ----- Method: CCodeGenerator>>const:declareC: (in category 'public') ----- const: constName declareC: declarationString "Record the given C declaration for a constant." constants + at: constName - at: constName asString put: (TDefineNode new + setName: constName - setName: constName asString value: declarationString)! Item was changed: ----- Method: TDefineNode>>name (in category 'accessing') ----- name + ^name! - ^name asString! Item was changed: ----- Method: VMBasicConstants class>>defineAtCompileTime: (in category 'C translation') ----- + defineAtCompileTime: anObject + ^anObject isSymbol + and: [self namesDefinedAtCompileTime includes: anObject]! - defineAtCompileTime: aSymbol - self assert: aSymbol isSymbol. - ^self namesDefinedAtCompileTime includes: aSymbol! Item was changed: ----- Method: VMPluginCodeGenerator>>generateInterpreterProxyFunctionDeference:on:indent: (in category 'C translation') ----- generateInterpreterProxyFunctionDeference: aNode on: aStream indent: anInteger | pluginsToClone | (pluginsToClone := self pluginFunctionsToClone) isEmpty ifTrue: [^self]. + aStream cr; nextPutAll: '#if !!defined(SQUEAK_BUILTIN_PLUGIN)'; cr. - aStream cr; nextPutAll: '#if !!defined(SQUEAK_BUILTIN_PLUGIN)'. pluginsToClone do: [:s| | cs | cs := self cFunctionNameFor: s. self withOptionalVerbiageFor: s on: aStream + do: [aStream tab: anInteger; nextPutAll: cs; nextPutAll: ' = interpreterProxy->'; nextPutAll: cs; nextPut: $;; cr] - do: [aStream crtab: anInteger; nextPutAll: cs; nextPutAll: ' = interpreterProxy->'; nextPutAll: cs; nextPut: $;] ifOptionalDo: [aStream + nextPutAll: '# if !!defined('; nextPutAll: cs; nextPut: $); - cr; nextPutAll: '# if !!defined('; nextPutAll: cs; nextPut: $); crtab: anInteger; nextPutAll: cs; nextPutAll: ' = 0;'; + cr; nextPutAll: '# endif'; cr]]. + aStream nextPutAll: '#endif /* !!defined(SQUEAK_BUILTIN_PLUGIN) */'.! - cr; nextPutAll: '# endif']]. - aStream cr; nextPutAll: '#endif /* !!defined(SQUEAK_BUILTIN_PLUGIN) */'.! Item was changed: ----- Method: VMPluginCodeGenerator>>preDeclareInterpreterProxyOn: (in category 'C code generator') ----- preDeclareInterpreterProxyOn: aStream "Put the necessary #defines needed before interpreterProxy. Basically internal plugins use the VM's interpreterProxy variable and external plugins use their own. Override to keep local copies of all functions in external prims, and link directly in internal plugins." "| pcc | pcc := self new. (InterpreterProxy selectors reject: [:s| #(initialize private) includes: (InterpreterProxy whichCategoryIncludesSelector: s)]) do: [:s| pcc noteUsedPluginFunction: s]. pcc preDeclareInterpreterProxyOn: Transcript. Transcript flush" | pluginFuncs interpreterClass objectMemoryClass | (pluginFuncs := self pluginFunctionsToClone) isEmpty ifTrue: [^super preDeclareInterpreterProxyOn: aStream]. aStream cr; nextPutAll: '#if !!defined(SQUEAK_BUILTIN_PLUGIN)'; cr. interpreterClass := self referenceInterpreterClass. objectMemoryClass := self referenceObjectMemoryClass. pluginFuncs := pluginFuncs collect: [:selector| | reference actual | reference := self compileToTMethodSelector: selector in: ((interpreterClass whichClassIncludesSelector: selector) ifNil: [(objectMemoryClass whichClassIncludesSelector: selector) ifNil: [InterpreterProxy]]). actual := self compileToTMethodSelector: selector in: InterpreterProxy. (reference returnType ~= actual returnType or: [(1 to: reference args size) anySatisfy: [:i| (reference typeFor: (reference args at: i) in: self) ~= (actual typeFor: (actual args at: i) in: self)]]) ifTrue: [self logger nextPutAll: 'warning, signature of InterpreterProxy>>'; nextPutAll: selector; nextPutAll: ' does not match reference implementation.'; cr]. actual]. pluginFuncs do: [:tMethod| tMethod recordDeclarationsIn: self. tMethod returnType ifNil: [tMethod inferReturnTypeIn: self]]. pluginFuncs do: [:tMethod| | functionName | functionName := self cFunctionNameFor: tMethod selector. aStream nextPutAll: ((String streamContents: [:s| tMethod static: true; emitCFunctionPrototype: s generator: self]) copyReplaceAll: functionName with: '(*', functionName, ')' tokenish: [:ch| ch = $_ or: [ch isAlphaNumeric]])]. + aStream nextPutAll: '#else /* !!defined(SQUEAK_BUILTIN_PLUGIN) */'; cr. - aStream nextPutAll: '#else /* !!defined(SQUEAK_BUILTIN_PLUGIN) */'. pluginFuncs do: [:tMethod| self withOptionalVerbiageFor: tMethod selector on: aStream + do: [tMethod static: false; export: false; emitCFunctionPrototype: aStream generator: self] - do: [aStream cr. - tMethod static: false; export: false; emitCFunctionPrototype: aStream generator: self. - aStream nextPut: $;] ifOptionalDo: + [aStream nextPutAll: '# define '. - [aStream cr; nextPutAll: '# define '. (TSendNode new setSelector: tMethod selector receiver: (TVariableNode new setName: 'interpreterProxy') arguments: (tMethod args collect: [:a| TVariableNode new setName: a])) emitCCodeAsArgumentOn: aStream level: 0 generator: self. + aStream nextPutAll: ' 0'; cr]]. + aStream nextPutAll: 'extern'; cr; nextPutAll: '#endif'; cr! - aStream nextPutAll: ' 0']]. - aStream cr; nextPutAll: 'extern'. - aStream cr; nextPutAll: '#endif'; cr! Item was changed: ----- Method: VMPluginCodeGenerator>>withOptionalVerbiageFor:on:do:ifOptionalDo: (in category 'C translation') ----- withOptionalVerbiageFor: selector on: aStream do: mainBlock ifOptionalDo: optionalBlock (InterpreterProxy >> selector pragmaAt: #option:) ifNil: [mainBlock value] ifNotNil: [:pragma| - aStream cr. self emitIfdefForPluginFunctionOption: pragma arguments first on: aStream. + aStream cr. mainBlock value. + aStream nextPutAll: '#else'; cr. - aStream cr; nextPutAll: '#else'. optionalBlock value. + aStream nextPutAll: '#endif'; cr]! - aStream cr; nextPutAll: '#endif']!

1 0

VM Maker: VMMaker.oscog-eem.1676.mcz
by commits＠source.squeak.org 13 Feb '16

13 Feb '16

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.1676.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.1676 Author: eem Time: 13 February 2016, 4:36:28.183629 pm UUID: 21db194f-99da-4bb8-b89e-3101d8f6f498 Ancestors: VMMaker.oscog-eem.1675 NewspeakVM: Don't use cppIf: #NewspeakVM in VM code. It is appropriate only in plugin code. VM code should use the NewspeakVM variable from VMBasicConstants. Slang: Fix nilOrBooleanConditionFor: to also work for symbol arguments (such as #Newspeak). Emit a warning if a symbol is used in VM code when a variable also exists and the symbol/variable is not one that is defined at compile time. Provide an abstraction for namesDefinedAtCompileTime to avoid the #includes: call that existed in all clients. =============== Diff against VMMaker.oscog-eem.1675 =============== Item was changed: ----- Method: CCodeGenerator>>emitCConstants:on: (in category 'C code generator') ----- emitCConstants: constList on: aStream "Store the global variable declarations on the given stream." constList isEmpty ifTrue: [^self]. aStream cr; nextPutAll: '/*** Constants ***/'; cr. (self sortStrings: constList) do: [:varName| | node default value conditional | node := constants at: varName. node name isEmpty ifFalse: ["If the definition includes a C comment, take it as is, otherwise convert the value from Smalltalk to C. Allow the class to provide an alternative definition, either of just the value or the whole shebang." default := (node value isString and: [node value includesSubString: '/*']) ifTrue: [node value] ifFalse: [self cLiteralFor: node value name: varName]. default = #undefined ifTrue: [aStream nextPutAll: '#undef '; nextPutAll: node name; cr] ifFalse: + [conditional := VMBasicConstants defineAtCompileTime: node name. - [conditional := VMBasicConstants namesDefinedAtCompileTime includes: node name. conditional ifTrue: [aStream nextPutAll: '#if !!defined('; nextPutAll: node name; nextPutAll: ') /* Allow this to be overridden on the compiler command line */'; cr]. value := vmClass ifNotNil: [(vmClass specialValueForConstant: node name default: default) ifNotNil: [:specialDef| specialDef] ifNil: [default]] ifNil: [default]. value first ~= $# ifTrue: [aStream nextPutAll: (conditional ifTrue: ['# define '] ifFalse: ['#define ']); nextPutAll: node name; space]. aStream nextPutAll: value; cr. conditional ifTrue: [aStream nextPutAll: '#endif'; cr]]]]. aStream cr! Item was changed: ----- Method: CCodeGenerator>>isConstantNode:valueInto: (in category 'utilities') ----- isConstantNode: aNode valueInto: aBlock "Answer if aNode evaluates to a constant, and if so, evaluate aBlock with the value of that constant." aNode isConstant ifTrue: [(aNode isDefine + and: [VMBasicConstants defineAtCompileTime: aNode name]) ifTrue: - and: [VMBasicConstants namesDefinedAtCompileTime includes: aNode name]) ifTrue: [^false]. aBlock value: aNode value. ^true]. (aNode isVariable and: [aNode name = #nil]) ifTrue: [aBlock value: nil. ^true]. aNode isSend ifFalse: [^false]. (self anyMethodNamed: aNode selector) ifNil: [(VMBasicConstants valueOfBasicSelector: aNode selector) ifNotNil: [:value| aBlock value: value. ^true]] ifNotNil: [:m| (m statements size = 1 and: [m statements last isReturn]) ifTrue: [^self isConstantNode: m statements last expression valueInto: aBlock]]. ^false! Item was changed: ----- Method: CCodeGenerator>>nilOrBooleanConditionFor: (in category 'utilities') ----- nilOrBooleanConditionFor: nodeOrNil "If nodeOrNil is one of the conditional sends for which we do translation-time dead code elimination (i.e. cppIf:ifTrue: et al or ifTrue: et al) and the conditional does evaluate to a translation-time boolean constant, answer that constant, otherwise answer nil. Used to prune dead code, + either for code generaton or dead variable elimination." + generateDeadCode ifTrue: [^nil]. - either for code egenraton or dead variable elimination." nodeOrNil ifNil: [^nil]. nodeOrNil isSend ifFalse: [^nil]. (#(cppIf:ifTrue: cppIf:ifTrue:ifFalse:) includes: nodeOrNil selector) ifTrue: + [(vmClass notNil + and: [nodeOrNil args first isConstant + and: [nodeOrNil args first value isSymbol + and: [(VMBasicConstants defineAtCompileTime: nodeOrNil args first value) not + and: [(vmClass bindingOf: nodeOrNil args first value) notNil]]]]) ifTrue: + [self logger + nextPutAll: 'Warning: cppIf: reference to '; + store: nodeOrNil args first value; + nextPutAll: ' when variable of same name exists.'; cr]. + + ^(optionsDictionary notNil - [^(optionsDictionary notNil and: [nodeOrNil args first isConstant and: [#(true false) includes: (optionsDictionary at: nodeOrNil args first name ifAbsent: [nil])]]) ifTrue: [optionsDictionary at: nodeOrNil args first name]]. ^(#(ifTrue: ifFalse: ifTrue:ifFalse: ifFalse:ifTrue:) includes: nodeOrNil selector) ifTrue: [self nilOrBooleanConstantReceiverOf: nodeOrNil]! Item was changed: ----- Method: CCodeGenerator>>optionIsTrue:in: (in category 'utilities') ----- optionIsTrue: pragma in: aClass "Answer whether an option: or notOption: pragma is true in the context of aClass. The argument to the option: pragma is interpreted as either a Cogit class name or a class variable name or a variable name in VMBasicConstants." | key | key := pragma argumentAt: 1. "If the option is one to be defined at compile time we'll generate a conditional around its declaration and definition." + (VMBasicConstants defineAtCompileTime: key) ifTrue: - (VMBasicConstants namesDefinedAtCompileTime includes: key) ifTrue: [^true]. "If the option is the name of a subclass of Cogit, include it if it inherits from the Cogit class." (Smalltalk classNamed: key) ifNotNil: [:optionClass| aClass cogitClass ifNotNil: [:cogitClass| (optionClass includesBehavior: Cogit) ifTrue: [^cogitClass includesBehavior: optionClass]]. aClass objectMemoryClass ifNotNil: [:objectMemoryClass| ((optionClass includesBehavior: ObjectMemory) or: [optionClass includesBehavior: SpurMemoryManager]) ifTrue: [^objectMemoryClass includesBehavior: optionClass]]]. "Lookup options in options, class variables of the defining class, VMBasicConstants, the interpreterClass and the objectMemoryClass" {aClass initializationOptions. aClass. VMBasicConstants. aClass interpreterClass. aClass objectMemoryClass} do: [:scopeOrNil| scopeOrNil ifNotNil: [:scope| (scope bindingOf: key) ifNotNil: [:binding| binding value ~~ false ifTrue: [^true]]]]. ^false! Item was changed: ----- Method: CoInterpreter>>findNewMethodInClassTag: (in category 'message sending') ----- findNewMethodInClassTag: classTagArg "Find the compiled method to be run when the current messageSelector is sent to the given classTag, setting the values of newMethod and primitiveIndex." | ok classTag | <inline: false> ok := self lookupInMethodCacheSel: messageSelector classTag: classTagArg. ok ifTrue: [self ifAppropriateCompileToNativeCode: newMethod selector: messageSelector] ifFalse: ["entry was not found in the cache; perhaps soemthing was forwarded." classTag := classTagArg. ((objectMemory isOopForwarded: messageSelector) or: [objectMemory isForwardedClassTag: classTag]) ifTrue: [(objectMemory isOopForwarded: messageSelector) ifTrue: [messageSelector := self handleForwardedSelectorFaultFor: messageSelector]. (objectMemory isForwardedClassTag: classTag) ifTrue: [classTag := self handleForwardedSendFaultForTag: classTag]. ok := self lookupInMethodCacheSel: messageSelector classTag: classTag. ok ifTrue: [^self ifAppropriateCompileToNativeCode: newMethod selector: messageSelector]]. "entry was not found in the cache; look it up the hard way " lkupClass := objectMemory classForClassTag: classTag. + NewspeakVM - self cppIf: #NewspeakVM ifTrue: [self lookupOrdinarySend] ifFalse: [self lookupMethodInClass: lkupClass]. self addNewMethodToCache: lkupClass]! Item was changed: ----- Method: CoInterpreter>>lookupMNU:receiver: (in category 'cog jit support') ----- lookupMNU: selector receiver: rcvr <api> "Lookup selector in rcvr, without doing MNU processing, and answer either a method or an error code if the message was not understood. Used to populate closed PICs." | classTag inCache erridx | "self printFrame: stackPage headFP WithSP: stackPage headSP" "self printStringOf: selector" classTag := objectMemory fetchClassTagOf: rcvr. + NewspeakVM - self cppIf: #NewspeakVM ifTrue: + [inCache := self + inlineLookupInNSMethodCacheSel: selector + classTag: classTag + method: 0 + lookupRule: LookupRuleMNU] - [inCache := (self - inlineLookupInNSMethodCacheSel: selector - classTag: classTag - method: 0 - lookupRule: LookupRuleMNU)] ifFalse: [inCache := self lookupInMethodCacheSel: selector classTag: classTag]. inCache ifFalse: [messageSelector := selector. erridx := self lookupMNUInClass: (objectMemory classForClassTag: classTag). erridx ~= 0 ifTrue: [self assert: erridx <= self maxLookupNoMNUErrorCode. ^erridx]]. ^newMethod! Item was changed: ----- Method: Cogit>>maybeAllocAndInitIRCs (in category 'newspeak support') ----- maybeAllocAndInitIRCs "If this is the Newspeak VM and the objectRepresentation supports pinning then allocate space for the implicit receiver caches on the heap." + NewspeakVM - self cppIf: #NewspeakVM ifTrue: [indexOfIRC := theIRCs := 0. (objectRepresentation canPinObjects and: [numIRCs > 0]) ifTrue: [self assert: (self noAssertMethodClassAssociationOf: methodObj) ~= objectMemory nilObject. theIRCs := objectRepresentation allocateNPinnedSlots: numIRCs * NumOopsPerNSC. ^theIRCs ~= 0]. ^true] ifFalse: [^true]! Item was changed: ----- Method: Cogit>>maybeMarkIRCsIn: (in category 'newspeak support') ----- maybeMarkIRCsIn: cogMethod <inline: true> + NewspeakVM ifTrue: - self cppIf: #NewspeakVM ifTrue: [objectRepresentation canPinObjects ifTrue: [objectRepresentation markIfIRC: cogMethod nextMethodOrIRCs]]! Item was changed: ----- Method: Cogit>>scanMethod (in category 'compile abstract instructions') ----- scanMethod "Scan the method (and all embedded blocks) to determine - what the last bytecode is; extra bytes at the end of a method are used to encode things like source pointers or temp names - if the method needs a frame or not - what are the targets of any backward branches. - how many blocks it creates - if it contans an unknown bytecode Answer the block count or on error a negative error code" | latestContinuation nExts descriptor pc numBlocks distance targetPC framelessStackDelta | <var: #descriptor type: #'BytecodeDescriptor *'> needsFrame := false. inBlock := false. + NewspeakVM ifTrue: - self cppIf: #NewspeakVM ifTrue: [numIRCs := 0]. (primitiveIndex > 0 and: [coInterpreter isQuickPrimitiveIndex: primitiveIndex]) ifTrue: [^0]. pc := latestContinuation := initialPC. numBlocks := framelessStackDelta := nExts := extA := extB := 0. [pc <= endPC] whileTrue: [byte0 := (objectMemory fetchByte: pc ofObject: methodObj) + bytecodeSetOffset. descriptor := self generatorAt: byte0. descriptor isExtension ifTrue: [descriptor opcode = Nop ifTrue: "unknown bytecode tag; see Cogit class>>#generatorTableFrom:" [^EncounteredUnknownBytecode]. self loadSubsequentBytesForDescriptor: descriptor at: pc. self perform: descriptor generator]. (descriptor isReturn and: [pc >= latestContinuation]) ifTrue: [endPC := pc]. needsFrame ifFalse: [(descriptor needsFrameFunction isNil or: [self perform: descriptor needsFrameFunction with: framelessStackDelta]) ifTrue: [needsFrame := true] ifFalse: [framelessStackDelta := framelessStackDelta + descriptor stackDelta]]. descriptor isBranch ifTrue: [distance := self spanFor: descriptor at: pc exts: nExts in: methodObj. targetPC := pc + descriptor numBytes + distance. (self isBackwardBranch: descriptor at: pc exts: nExts in: methodObj) ifTrue: [self initializeFixupAt: targetPC - initialPC] ifFalse: [latestContinuation := latestContinuation max: targetPC]]. descriptor isBlockCreation ifTrue: [numBlocks := numBlocks + 1. distance := self spanFor: descriptor at: pc exts: nExts in: methodObj. targetPC := pc + descriptor numBytes + distance. latestContinuation := latestContinuation max: targetPC]. + self cppIf: NewspeakVM ifTrue: - self cppIf: #NewspeakVM ifTrue: [descriptor hasIRC ifTrue: [numIRCs := numIRCs + 1]]. pc := pc + descriptor numBytes. descriptor isExtension ifTrue: [nExts := nExts + 1] ifFalse: [nExts := extA := extB := 0]]. ^numBlocks! Item was changed: ----- Method: SimpleStackBasedCogit>>compileFrameBuild (in category 'compile abstract instructions') ----- compileFrameBuild "Build a frame for a CogMethod activation. See CoInterpreter class>>initializeFrameIndices. receiver (in ReceiverResultReg) arg0 ... argN caller's saved ip/this stackPage (for a base frame) fp-> saved fp method context (uninitialized?) receiver first temp ... sp-> Nth temp If there is a primitive and an error code the Nth temp is the error code. Ensure SendNumArgsReg is set early on (incidentally to nilObj) because it is the flag determining whether context switch is allowed on stack-overflow." | jumpSkip | <inline: false> <var: #jumpSkip type: #'AbstractInstruction *'> needsFrame ifFalse: [^self]. backEnd hasLinkRegister ifTrue: [self PushR: LinkReg]. self PushR: FPReg. self MoveR: SPReg R: FPReg. methodLabel addDependent: (self annotateAbsolutePCRef: (self PushCw: methodLabel asInteger)). "method" self genMoveConstant: objectMemory nilObject R: SendNumArgsReg. self PushR: SendNumArgsReg. "context" self PushR: ReceiverResultReg. methodOrBlockNumArgs + 1 to: (coInterpreter temporaryCountOfMethodHeader: methodHeader) do: [:i| self PushR: SendNumArgsReg]. (self methodUsesPrimitiveErrorCode: methodObj header: methodHeader) ifTrue: [self compileGetErrorCode]. self MoveAw: coInterpreter stackLimitAddress R: TempReg. self CmpR: TempReg R: SPReg. "N.B. FLAGS := SPReg - TempReg" "If we can't context switch for this method, use a slightly slower overflow check that clears SendNumArgsReg." (coInterpreter canContextSwitchIfActivating: methodObj header: methodHeader) ifTrue: [self JumpBelow: stackOverflowCall. stackCheckLabel := self Label] ifFalse: [jumpSkip := self JumpAboveOrEqual: 0. self MoveCq: 0 R: SendNumArgsReg. self Jump: stackOverflowCall. jumpSkip jmpTarget: (stackCheckLabel := self Label)]. self annotateBytecode: stackCheckLabel. + NewspeakVM ifTrue: - self cppIf: #NewspeakVM ifTrue: [numIRCs > 0 ifTrue: [self PrefetchAw: theIRCs]]! Item was changed: ----- Method: SistaStackToRegisterMappingCogit>>compileBlockBodies (in category 'compile abstract instructions') ----- compileBlockBodies "override to maintain counterIndex when recompiling blocks; sigh." <inline: false> | result compiledBlocksCount blockStart savedNeedsFrame savedNumArgs savedNumTemps initialStackPtr initialOpcodeIndex initialCounterIndex initialIndexOfIRC | <var: #blockStart type: #'BlockStart *'> self assert: blockCount > 0. "scanBlock: in compileBlockEntry: sets both of these appropriately for each block." savedNeedsFrame := needsFrame. savedNumArgs := methodOrBlockNumArgs. savedNumTemps := methodOrBlockNumTemps. inBlock := true. compiledBlocksCount := 0. [compiledBlocksCount < blockCount] whileTrue: [blockStart := self blockStartAt: compiledBlocksCount. self scanBlock: blockStart. initialOpcodeIndex := opcodeIndex. initialCounterIndex := counterIndex. + NewspeakVM ifTrue: - self cppIf: #NewspeakVM ifTrue: [initialIndexOfIRC := indexOfIRC]. [self compileBlockEntry: blockStart. initialStackPtr := simStackPtr. (result := self compileAbstractInstructionsFrom: blockStart startpc + (self pushNilSize: methodObj numInitialNils: blockStart numInitialNils) through: blockStart startpc + blockStart span - 1) < 0 ifTrue: [^result]. "If the final simStackPtr is less than the initial simStackPtr then scanBlock: over- estimated the number of initial nils (because it assumed one or more pushNils to produce an operand were pushNils to initialize temps. This is very rare, so compensate by checking, adjusting numInitialNils and recompiling the block body. N.B. No need to reinitialize the literalsManager because it answers existing literals." initialStackPtr = simStackPtr] whileFalse: [self assert: initialStackPtr > simStackPtr. blockStart numInitialNils: blockStart numInitialNils + simStackPtr - initialStackPtr. blockStart fakeHeader dependent: nil. self reinitializeFixupsFrom: blockStart startpc + blockStart numInitialNils through: blockStart startpc + blockStart span - 1. self cCode: 'bzero(abstractOpcodes + initialOpcodeIndex, (opcodeIndex - initialOpcodeIndex) * sizeof(AbstractInstruction))' inSmalltalk: [initialOpcodeIndex to: opcodeIndex - 1 do: [:i| abstractOpcodes at: i put: (CogCompilerClass for: self)]]. opcodeIndex := initialOpcodeIndex. counterIndex := initialCounterIndex. + NewspeakVM ifTrue: - self cppIf: #NewspeakVM ifTrue: [indexOfIRC := initialIndexOfIRC]]. compiledBlocksCount := compiledBlocksCount + 1]. needsFrame := savedNeedsFrame. methodOrBlockNumArgs := savedNumArgs. methodOrBlockNumTemps := savedNumTemps. ^0! Item was changed: ----- Method: SistaStackToRegisterMappingCogit>>scanMethod (in category 'compile abstract instructions') ----- scanMethod "Scan the method (and all embedded blocks) to determine - what the last bytecode is; extra bytes at the end of a method are used to encode things like source pointers or temp names - if the method needs a frame or not - what are the targets of any backward branches. - how many blocks it creates - how many counters it needs/conditional branches it contains Answer the block count or on error a negative error code" | latestContinuation nExts descriptor pc numBlocks distance targetPC framelessStackDelta | <var: #descriptor type: #'BytecodeDescriptor *'> needsFrame := false. inBlock := false. prevBCDescriptor := nil. numCounters := 0. + NewspeakVM ifTrue: - self cppIf: #NewspeakVM ifTrue: [numIRCs := 0]. (primitiveIndex > 0 and: [coInterpreter isQuickPrimitiveIndex: primitiveIndex]) ifTrue: [^0]. pc := latestContinuation := initialPC. numBlocks := framelessStackDelta := nExts := extA := extB := 0. [pc <= endPC] whileTrue: [byte0 := (objectMemory fetchByte: pc ofObject: methodObj) + bytecodeSetOffset. descriptor := self generatorAt: byte0. descriptor isExtension ifTrue: [descriptor opcode = Nop ifTrue: "unknown bytecode tag; see Cogit class>>#generatorTableFrom:" [^EncounteredUnknownBytecode]. self loadSubsequentBytesForDescriptor: descriptor at: pc. self perform: descriptor generator]. (descriptor isReturn and: [pc >= latestContinuation]) ifTrue: [endPC := pc]. needsFrame ifFalse: [(descriptor needsFrameFunction isNil or: [self perform: descriptor needsFrameFunction with: framelessStackDelta]) ifTrue: [needsFrame := true] ifFalse: [framelessStackDelta := framelessStackDelta + descriptor stackDelta]]. descriptor isBranch ifTrue: [distance := self spanFor: descriptor at: pc exts: nExts in: methodObj. targetPC := pc + descriptor numBytes + distance. (self isBackwardBranch: descriptor at: pc exts: nExts in: methodObj) ifTrue: [self initializeFixupAt: targetPC - initialPC] ifFalse: [latestContinuation := latestContinuation max: targetPC. (descriptor isBranchTrue or: [descriptor isBranchFalse]) ifTrue: [numCounters := numCounters + 1]]]. descriptor isBlockCreation ifTrue: [numBlocks := numBlocks + 1. distance := self spanFor: descriptor at: pc exts: nExts in: methodObj. targetPC := pc + descriptor numBytes + distance. latestContinuation := latestContinuation max: targetPC]. + NewspeakVM ifTrue: - self cppIf: #NewspeakVM ifTrue: [descriptor hasIRC ifTrue: [numIRCs := numIRCs + 1]]. pc := pc + descriptor numBytes. descriptor isExtension ifTrue: [nExts := nExts + 1] ifFalse: [nExts := extA := extB := 0]. prevBCDescriptor := descriptor]. ^numBlocks! Item was changed: ----- Method: StackInterpreter>>findNewMethodInClassTag: (in category 'message sending') ----- findNewMethodInClassTag: classTagArg "Find the compiled method to be run when the current messageSelector is sent to the given class, setting the values of 'newMethod' and 'primitiveIndex'." | ok classTag | <inline: false> ok := self lookupInMethodCacheSel: messageSelector classTag: classTagArg. ok ifFalse: "entry was not found in the cache; look it up the hard way " [classTag := classTagArg. ((objectMemory isOopForwarded: messageSelector) or: [objectMemory isForwardedClassTag: classTag]) ifTrue: [(objectMemory isOopForwarded: messageSelector) ifTrue: [messageSelector := self handleForwardedSelectorFaultFor: messageSelector]. (objectMemory isForwardedClassTag: classTag) ifTrue: [classTag := self handleForwardedSendFaultForTag: classTag]. ok := self lookupInMethodCacheSel: messageSelector classTag: classTag. ok ifTrue: [^nil]]. lkupClass := objectMemory classForClassTag: classTag. + NewspeakVM - self cppIf: #NewspeakVM ifTrue: [self lookupOrdinarySend] ifFalse: [self lookupMethodInClass: lkupClass]. self addNewMethodToCache: lkupClass]! Item was changed: ----- Method: StackInterpreter>>lookupMNUInClass: (in category 'message sending') ----- lookupMNUInClass: class "Lookup messageSelector in class. Answer 0 on success. Answer the splObj: index for the error selector to use on failure rather than performing MNU processing etc." | currentClass dictionary found | <inline: false> currentClass := class. [currentClass ~= objectMemory nilObject] whileTrue: [dictionary := objectMemory followObjField: MethodDictionaryIndex ofObject: currentClass. dictionary = objectMemory nilObject ifTrue: [lkupClass := self superclassOf: currentClass. ^SelectorCannotInterpret]. found := self lookupMethodInDictionary: dictionary. + NewspeakVM - self cppIf: #NewspeakVM ifTrue: [found ifTrue: [lkupClass := class. self addNewMethodToNSCache: LookupRuleMNU. ^0]] ifFalse: [found ifTrue: [self addNewMethodToCache: class. ^0]]. currentClass := self superclassOf: currentClass]. lkupClass := class. ^SelectorDoesNotUnderstand! Item was changed: ----- Method: StackInterpreter>>lookupOrdinaryNoMNUEtcInClass: (in category 'message sending') ----- lookupOrdinaryNoMNUEtcInClass: class "Lookup messageSelector in class. Answer 0 on success. Answer the splObj: index for the error selector to use on failure rather than performing MNU processing etc." | currentClass dictionary found | <inline: false> currentClass := class. [currentClass ~= objectMemory nilObject] whileTrue: [dictionary := objectMemory followObjField: MethodDictionaryIndex ofObject: currentClass. dictionary = objectMemory nilObject ifTrue: [lkupClass := self superclassOf: currentClass. ^SelectorCannotInterpret]. found := self lookupMethodInDictionary: dictionary. + NewspeakVM - self cppIf: #NewspeakVM ifTrue: [found ifTrue: [(self isPublicMethod: newMethod) ifTrue: [self addNewMethodToCache: class. ^0]. (self isProtectedMethod: newMethod) ifTrue: [lkupClass := class. ^SelectorDoesNotUnderstand]]] ifFalse: [found ifTrue: [self addNewMethodToCache: class. ^0]]. currentClass := self superclassOf: currentClass]. lkupClass := class. ^SelectorDoesNotUnderstand! Item was changed: ----- Method: StackToRegisterMappingCogit>>compileBlockBodies (in category 'compile abstract instructions') ----- compileBlockBodies <inline: false> | result compiledBlocksCount blockStart savedNeedsFrame savedNumArgs savedNumTemps initialStackPtr initialOpcodeIndex initialIndexOfIRC | <var: #blockStart type: #'BlockStart *'> self assert: blockCount > 0. "scanBlock: in compileBlockEntry: sets both of these appropriately for each block." savedNeedsFrame := needsFrame. savedNumArgs := methodOrBlockNumArgs. savedNumTemps := methodOrBlockNumTemps. inBlock := true. compiledBlocksCount := 0. [compiledBlocksCount < blockCount] whileTrue: [blockStart := self blockStartAt: compiledBlocksCount. self scanBlock: blockStart. initialOpcodeIndex := opcodeIndex. literalsManager saveForBlockCompile. + NewspeakVM ifTrue: - self cppIf: #NewspeakVM ifTrue: [initialIndexOfIRC := indexOfIRC]. [self compileBlockEntry: blockStart. initialStackPtr := simStackPtr. (result := self compileAbstractInstructionsFrom: blockStart startpc + (self pushNilSize: methodObj numInitialNils: blockStart numInitialNils) through: blockStart startpc + blockStart span - 1) < 0 ifTrue: [^result]. "If the final simStackPtr is less than the initial simStackPtr then scanBlock: over- estimated the number of initial nils (because it assumed one or more pushNils to produce an operand were pushNils to initialize temps. This is very rare, so compensate by checking, adjusting numInitialNils and recompiling the block body. N.B. No need to reinitialize the literalsManager because it answers existing literals." initialStackPtr = simStackPtr] whileFalse: [self assert: initialStackPtr > simStackPtr. blockStart numInitialNils: blockStart numInitialNils + simStackPtr - initialStackPtr. blockStart fakeHeader dependent: nil. self reinitializeFixupsFrom: blockStart startpc + blockStart numInitialNils through: blockStart startpc + blockStart span - 1. self cCode: 'bzero(abstractOpcodes + initialOpcodeIndex, (opcodeIndex - initialOpcodeIndex) * sizeof(AbstractInstruction))' inSmalltalk: [initialOpcodeIndex to: opcodeIndex - 1 do: [:i| abstractOpcodes at: i put: (CogCompilerClass for: self)]]. opcodeIndex := initialOpcodeIndex. literalsManager resetForBlockCompile. + NewspeakVM ifTrue: - self cppIf: #NewspeakVM ifTrue: [indexOfIRC := initialIndexOfIRC]]. compiledBlocksCount := compiledBlocksCount + 1]. needsFrame := savedNeedsFrame. methodOrBlockNumArgs := savedNumArgs. methodOrBlockNumTemps := savedNumTemps. ^0! Item was changed: ----- Method: StackToRegisterMappingCogit>>scanMethod (in category 'compile abstract instructions') ----- scanMethod "Scan the method (and all embedded blocks) to determine - what the last bytecode is; extra bytes at the end of a method are used to encode things like source pointers or temp names - if the method needs a frame or not - what are the targets of any backward branches. - how many blocks it creates Answer the block count or on error a negative error code" | latestContinuation nExts descriptor pc numBlocks distance targetPC framelessStackDelta | <var: #descriptor type: #'BytecodeDescriptor *'> needsFrame := false. inBlock := false. prevBCDescriptor := nil. + NewspeakVM ifTrue: - self cppIf: #NewspeakVM ifTrue: [numIRCs := 0]. (primitiveIndex > 0 and: [coInterpreter isQuickPrimitiveIndex: primitiveIndex]) ifTrue: [^0]. pc := latestContinuation := initialPC. numBlocks := framelessStackDelta := nExts := extA := extB := 0. [pc <= endPC] whileTrue: [byte0 := (objectMemory fetchByte: pc ofObject: methodObj) + bytecodeSetOffset. descriptor := self generatorAt: byte0. descriptor isExtension ifTrue: [descriptor opcode = Nop ifTrue: "unknown bytecode tag; see Cogit class>>#generatorTableFrom:" [^EncounteredUnknownBytecode]. self loadSubsequentBytesForDescriptor: descriptor at: pc. self perform: descriptor generator]. (descriptor isReturn and: [pc >= latestContinuation]) ifTrue: [endPC := pc]. needsFrame ifFalse: [(descriptor needsFrameFunction isNil or: [self perform: descriptor needsFrameFunction with: framelessStackDelta]) ifTrue: [needsFrame := true] ifFalse: [framelessStackDelta := framelessStackDelta + descriptor stackDelta]]. descriptor isBranch ifTrue: [distance := self spanFor: descriptor at: pc exts: nExts in: methodObj. targetPC := pc + descriptor numBytes + distance. (self isBackwardBranch: descriptor at: pc exts: nExts in: methodObj) ifTrue: [self initializeFixupAt: targetPC - initialPC] ifFalse: [latestContinuation := latestContinuation max: targetPC]]. descriptor isBlockCreation ifTrue: [numBlocks := numBlocks + 1. distance := self spanFor: descriptor at: pc exts: nExts in: methodObj. targetPC := pc + descriptor numBytes + distance. latestContinuation := latestContinuation max: targetPC]. + NewspeakVM ifTrue: - self cppIf: #NewspeakVM ifTrue: [descriptor hasIRC ifTrue: [numIRCs := numIRCs + 1]]. pc := pc + descriptor numBytes. descriptor isExtension ifTrue: [nExts := nExts + 1] ifFalse: [nExts := extA := extB := 0]. prevBCDescriptor := descriptor]. ^numBlocks! Item was changed: ----- Method: TMethod>>compileTimeOptionPragmas (in category 'accessing') ----- compileTimeOptionPragmas "Answer the (possibly empty) sequence of option: or notOption: pragmas whose arguments are values to be defined at compile time." ^self compiledMethod pragmas select: [:pragma| (#option: == pragma keyword or: [#notOption: == pragma keyword]) + and: [VMBasicConstants defineAtCompileTime: (pragma argumentAt: 1)]]! - and: [VMBasicConstants namesDefinedAtCompileTime includes: (pragma argumentAt: 1)]]! Item was changed: ----- Method: TMethod>>compiledMethod (in category 'accessing') ----- compiledMethod + ^definingClass + compiledMethodAt: selector + ifAbsent: [definingClass compiledMethodAt: properties selector]! - ^definingClass >> selector! Item was added: + ----- Method: VMBasicConstants class>>defineAtCompileTime: (in category 'C translation') ----- + defineAtCompileTime: aSymbol + self assert: aSymbol isSymbol. + ^self namesDefinedAtCompileTime includes: aSymbol! Item was changed: ----- Method: VMClass class>>shouldIncludeMethodForSelector: (in category 'translation') ----- shouldIncludeMethodForSelector: selector "Answer whether a primitive method should be translated. Emit a warning to the transcript if the method doesn't exist." ^(self whichClassIncludesSelector: selector) ifNotNil: [:c| (c >> selector pragmaAt: #option:) ifNotNil: [:pragma| + (VMBasicConstants defineAtCompileTime: pragma arguments first) - (VMBasicConstants namesDefinedAtCompileTime includes: pragma arguments first) or: [initializationOptions at: pragma arguments first ifAbsent: [(self bindingOf: pragma arguments first) ifNil: [false] ifNotNil: [:binding| binding value ~~ #undefined]]]] ifNil: [true]] ifNil: [Transcript nextPutAll: 'Cannot find implementation of '; nextPutAll: selector; nextPutAll: ' in hierarchy of '; print: self; cr; flush. false]!

1 0

VM Maker: VMMaker.oscog-eem.1675.mcz
by commits＠source.squeak.org 12 Feb '16

12 Feb '16

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.1675.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.1675 Author: eem Time: 12 February 2016, 11:59:28.202137 am UUID: 93ae77a3-3832-4364-83f3-531823c9bd31 Ancestors: VMMaker.oscog-eem.1674 IMMUTABILITY: Fix the declaration/definition of ceCannotAssignTo:withIndex:valueToAssign: which needs to be included, but only if -DIMMUTABILITY=1. So modify Slang to output #if FOO && !BAR code around functions that include option: pragmas whose arguments are in namesDefinedAtCompileTime. Tim, Esteban, I'm committing this so I can build new VMs now. I can't figure out if Esteban's changes for the IA32ABI plugin are correct yet (not enough brain power), but I can build with the source I generate, so I'm going to commit, generate source, build new VMs and then merge with your changes. Apologies. =============== Diff against VMMaker.oscog-eem.1674 =============== Item was changed: ----- Method: CCodeGenerator>>emitCConstants:on: (in category 'C code generator') ----- emitCConstants: constList on: aStream "Store the global variable declarations on the given stream." constList isEmpty ifTrue: [^self]. aStream cr; nextPutAll: '/*** Constants ***/'; cr. (self sortStrings: constList) do: [:varName| | node default value conditional | node := constants at: varName. node name isEmpty ifFalse: ["If the definition includes a C comment, take it as is, otherwise convert the value from Smalltalk to C. Allow the class to provide an alternative definition, either of just the value or the whole shebang." default := (node value isString and: [node value includesSubString: '/*']) ifTrue: [node value] ifFalse: [self cLiteralFor: node value name: varName]. default = #undefined ifTrue: [aStream nextPutAll: '#undef '; nextPutAll: node name; cr] ifFalse: [conditional := VMBasicConstants namesDefinedAtCompileTime includes: node name. + conditional ifTrue: - conditional ifTrue: [aStream nextPutAll: '#if !!defined('; nextPutAll: node name; nextPutAll: ') /* Allow this to be overridden on the compiler command line */'; cr]. + value := vmClass - value := vmClass ifNotNil: [(vmClass specialValueForConstant: node name default: default) ifNotNil: [:specialDef| specialDef] ifNil: [default]] ifNil: [default]. value first ~= $# ifTrue: + [aStream nextPutAll: (conditional ifTrue: ['# define '] ifFalse: ['#define ']); nextPutAll: node name; space]. - [aStream nextPutAll: '#define '; nextPutAll: node name; space]. aStream nextPutAll: value; cr. conditional ifTrue: [aStream nextPutAll: '#endif'; cr]]]]. aStream cr! Item was changed: ----- Method: CCodeGenerator>>emitCFunctionPrototypes:on: (in category 'C code generator') ----- emitCFunctionPrototypes: methodList on: aStream "Store prototype declarations for all non-inlined methods on the given stream. Add a define for a NoDbgRegParms attribute for static functions used for debugging. gcc and other compilers will use non-standard calling conventions for static functions when optimizing. The optimization can render the functions unusable in gdb. The sqConfig.h file for the platform should define PlatformNoDbgRegParms suitably for the platform's compiler, if the compiler can be persuaded not to generate such functions. Add a define for a NeverInline attribute that tells the compiler never to inline functions with the attribute. We mark functions we want to observe in a profiler as NeverInline. The sqConfig.h file for the platform should define NeverInline suitably for the platform's compiler, if the compiler can be persuaded not to inline certain functions." aStream cr; nextPutAll: '/*** Function Prototypes ***/'; cr. vmClass ifNotNil: [NoRegParmsInAssertVMs ifTrue: [aStream nextPutAll: '\\#if !!PRODUCTION && defined(PlatformNoDbgRegParms)\# define NoDbgRegParms PlatformNoDbgRegParms\#endif' withCRs. aStream nextPutAll: '\\#if !!defined(NoDbgRegParms)\# define NoDbgRegParms /*empty*/\#endif\\' withCRs]. aStream nextPutAll: '\\#if !!defined(NeverInline)\# define NeverInline /*empty*/\#endif\\' withCRs]. (methodList select: [:m| m isRealMethod and: [self shouldGenerateMethod: m]]) do: [:m | vmClass ifNotNil: [(NoRegParmsInAssertVMs and: [m export not and: [m isStatic and: [m args notEmpty]]]) ifTrue: [m addFunctionAttribute: 'NoDbgRegParms']. m inline == #never ifTrue: [m addFunctionAttribute: 'NeverInline']]. + m emitCFunctionPrototype: aStream generator: self]. - m emitCFunctionPrototype: aStream generator: self. - aStream nextPut: $; ; cr]. aStream cr! Item was changed: ----- Method: CCodeGenerator>>optionIsTrue:in: (in category 'utilities') ----- optionIsTrue: pragma in: aClass "Answer whether an option: or notOption: pragma is true in the context of aClass. The argument to the option: pragma is interpreted as either a Cogit class name or a class variable name or a variable name in VMBasicConstants." | key | key := pragma argumentAt: 1. + + "If the option is one to be defined at compile time we'll generate a + conditional around its declaration and definition." + (VMBasicConstants namesDefinedAtCompileTime includes: key) ifTrue: + [^true]. + "If the option is the name of a subclass of Cogit, include it if it inherits from the Cogit class." (Smalltalk classNamed: key) ifNotNil: [:optionClass| aClass cogitClass ifNotNil: [:cogitClass| (optionClass includesBehavior: Cogit) ifTrue: [^cogitClass includesBehavior: optionClass]]. aClass objectMemoryClass ifNotNil: [:objectMemoryClass| ((optionClass includesBehavior: ObjectMemory) or: [optionClass includesBehavior: SpurMemoryManager]) ifTrue: [^objectMemoryClass includesBehavior: optionClass]]]. "Lookup options in options, class variables of the defining class, VMBasicConstants, the interpreterClass and the objectMemoryClass" {aClass initializationOptions. aClass. VMBasicConstants. aClass interpreterClass. aClass objectMemoryClass} do: [:scopeOrNil| scopeOrNil ifNotNil: [:scope| (scope bindingOf: key) ifNotNil: [:binding| binding value ~~ false ifTrue: [^true]]]]. ^false! Item was changed: ----- Method: InterpreterPrimitives>>primitiveGetImmutability (in category 'object access primitives') ----- primitiveGetImmutability + self cppIf: #IMMUTABILITY + ifTrue: + [| rcvr | + rcvr := self stackValue: 0. + self pop: argumentCount + 1 thenPushBool: (objectMemory isOopImmutable: rcvr)] + ifFalse: + [self primitiveFailFor: PrimErrUnsupported]! - <option: #IMMUTABILITY> - | rcvr bool | - rcvr := self stackValue: 0. - bool := (objectMemory isOopImmutable: rcvr) - ifTrue: [ TrueObject ] - ifFalse: [ FalseObject ]. - self pop: argumentCount + 1 thenPush: (objectMemory splObj: bool)! Item was changed: ----- Method: InterpreterPrimitives>>primitiveSetImmutability (in category 'object access primitives') ----- primitiveSetImmutability + self cppIf: #IMMUTABILITY + ifTrue: + [| rcvr wasImmutable | + rcvr := self stackValue: 1. + (objectMemory isImmediate: rcvr) ifTrue: + [^self primitiveFailFor: PrimErrBadReceiver]. + wasImmutable := objectMemory isObjImmutable: rcvr. + self stackTop = objectMemory trueObject + ifTrue: + [(self canBeImmutable: rcvr) ifFalse: + [^self primitiveFailFor: PrimErrInappropriate]. + objectMemory setIsImmutableOf: rcvr to: true] + ifFalse: [ + self stackTop = objectMemory falseObject + ifTrue: [objectMemory setIsImmutableOf: rcvr to: false] + ifFalse: + [^self primitiveFailFor: PrimErrBadArgument]]. + self pop: argumentCount + 1 thenPushBool: wasImmutable] + ifFalse: + [self primitiveFailFor: PrimErrUnsupported]! - <option: #IMMUTABILITY> - | rcvr boolean wasImmutable | - rcvr := self stackValue: 1. - (objectMemory isImmediate: rcvr) ifTrue: - [^self primitiveFailFor: PrimErrBadReceiver]. - boolean := self booleanValueOf: self stackTop. - self successful ifFalse: - [^self primitiveFailFor: PrimErrBadArgument]. - boolean ifTrue: - [(self canBeImmutable: rcvr) ifFalse: - [^self primitiveFailFor: PrimErrInappropriate]]. - wasImmutable := objectMemory booleanObjectOf: (objectMemory isOopImmutable: rcvr). - objectMemory setIsImmutableOf: rcvr to: boolean. - self pop: argumentCount + 1 thenPush: wasImmutable! Item was added: + ----- Method: TMethod>>compileTimeOptionPragmas (in category 'accessing') ----- + compileTimeOptionPragmas + "Answer the (possibly empty) sequence of option: or notOption: pragmas + whose arguments are values to be defined at compile time." + ^self compiledMethod pragmas select: + [:pragma| + (#option: == pragma keyword or: [#notOption: == pragma keyword]) + and: [VMBasicConstants namesDefinedAtCompileTime includes: (pragma argumentAt: 1)]]! Item was changed: ----- Method: TMethod>>emitCCodeOn:generator: (in category 'C code generation') ----- emitCCodeOn: aStream generator: aCodeGen "Emit C code for this method onto the given stream. All calls to inlined methods should already have been expanded." + | conditional | aCodeGen currentMethod: self. self emitCCommentOn: aStream. "place method comment and method name before function." aStream crtab; nextPutAll: '/* '; nextPutAll: self definingClass name; nextPutAll: '>>#'; nextPutAll: self smalltalkSelector; nextPutAll: ' */'. aStream cr. + conditional := self emitCFunctionPrototype: aStream generator: aCodeGen isPrototype: false. - self emitCFunctionPrototype: aStream generator: aCodeGen isPrototype: false. aStream cr; nextPut: ${. self emitCLocalsOn: aStream generator: aCodeGen. aCodeGen pushScope: declarations while: [parseTree emitCCodeOn: aStream level: 1 generator: aCodeGen]. + aStream nextPut: $}; cr. + conditional ifTrue: + [self terminateConditionalDefineFor: self compileTimeOptionPragmas on: aStream]! - aStream nextPut: $}; cr! Item was changed: ----- Method: TMethod>>emitCFunctionPrototype:generator: (in category 'C code generation') ----- emitCFunctionPrototype: aStream generator: aCodeGen "Emit a C function header for this method onto the given stream." properties ifNotNil: [(properties at: #api: ifAbsent: []) ifNotNil: [:pragma| + aStream + nextPutAll: (pragma argumentAt: 1); + nextPut: $;; + cr. - aStream nextPutAll: (pragma argumentAt: 1). ^self]]. self emitCFunctionPrototype: aStream generator: aCodeGen isPrototype: true! Item was changed: ----- Method: TMethod>>emitCFunctionPrototype:generator:isPrototype: (in category 'C code generation') ----- emitCFunctionPrototype: aStream generator: aCodeGen isPrototype: isPrototype "<Boolean>" + "Emit a C function header for this method onto the given stream. + Answer if the method has any compileTimeOptionPragmas" + | compileTimeOptionPragmas returnTypeIsFunctionPointer | + (compileTimeOptionPragmas := self compileTimeOptionPragmas) notEmpty ifTrue: + [self outputConditionalDefineFor: compileTimeOptionPragmas on: aStream]. - "Emit a C function header for this method onto the given stream." - | returnTypeIsFunctionPointer | returnTypeIsFunctionPointer := returnType last = $) and: [returnType includesSubString: (aCodeGen cFunctionNameFor: selector)]. export ifTrue: [aStream nextPutAll: 'EXPORT('; nextPutAll: returnType; nextPut: $)] ifFalse: [self isStatic ifTrue: [aStream nextPutAll: 'static '] ifFalse: [isPrototype ifTrue: [aStream nextPutAll: 'extern ']]. (isPrototype or: [inline ~~ #always]) ifFalse: [aStream nextPutAll: 'inline ']. aStream nextPutAll: returnType]. (functionAttributes isNil or: [returnTypeIsFunctionPointer]) ifFalse: [aStream space; nextPutAll: functionAttributes]. isPrototype ifTrue: [aStream space] ifFalse: [aStream cr]. returnTypeIsFunctionPointer ifFalse: [aStream nextPutAll: (aCodeGen cFunctionNameFor: selector); nextPut: $(. args isEmpty ifTrue: [aStream nextPutAll: #void] ifFalse: [args do: [:arg| aStream nextPutAll: (self declarationAt: arg)] separatedBy: [aStream nextPutAll: ', ']]. + aStream nextPut: $)]. + isPrototype ifTrue: + [aStream nextPut: $;; cr. + self terminateConditionalDefineFor: compileTimeOptionPragmas on: aStream]. + ^compileTimeOptionPragmas notEmpty! - aStream nextPut: $)]! Item was added: + ----- Method: TMethod>>outputConditionalDefineFor:on: (in category 'C code generation') ----- + outputConditionalDefineFor: compileTimeOptionPragmas on: aStream + aStream nextPutAll: '#if '. + compileTimeOptionPragmas + do: [:pragma| + pragma keyword = #notOption: ifTrue: + [aStream nextPut: $!!]. + aStream nextPutAll: (pragma argumentAt: 1)] + separatedBy: [aStream nextPutAll: ' && ']. + aStream cr! Item was added: + ----- Method: TMethod>>terminateConditionalDefineFor:on: (in category 'C code generation') ----- + terminateConditionalDefineFor: compileTimeOptionPragmas on: aStream + compileTimeOptionPragmas ifEmpty: [^self]. + aStream nextPutAll: '#endif /* '. + compileTimeOptionPragmas + do: [:pragma| + pragma keyword = #notOption: ifTrue: + [aStream nextPut: $!!]. + aStream nextPutAll: (pragma argumentAt: 1)] + separatedBy: [aStream nextPutAll: ' && ']. + aStream nextPutAll: ' */'; cr! Item was changed: ----- Method: VMClass class>>shouldIncludeMethodForSelector: (in category 'translation') ----- shouldIncludeMethodForSelector: selector "Answer whether a primitive method should be translated. Emit a warning to the transcript if the method doesn't exist." ^(self whichClassIncludesSelector: selector) ifNotNil: [:c| (c >> selector pragmaAt: #option:) ifNotNil: [:pragma| + (VMBasicConstants namesDefinedAtCompileTime includes: pragma arguments first) + or: [initializationOptions + at: pragma arguments first + ifAbsent: [(self bindingOf: pragma arguments first) + ifNil: [false] + ifNotNil: [:binding| binding value ~~ #undefined]]]] - initializationOptions - at: pragma arguments first - ifAbsent: [(self bindingOf: pragma arguments first) - ifNil: [false] - ifNotNil: [:binding| binding value ~~ #undefined]]] ifNil: [true]] ifNil: [Transcript nextPutAll: 'Cannot find implementation of '; nextPutAll: selector; nextPutAll: ' in hierarchy of '; print: self; cr; flush. false]! Item was changed: ----- Method: VMPluginCodeGenerator>>preDeclareInterpreterProxyOn: (in category 'C code generator') ----- preDeclareInterpreterProxyOn: aStream "Put the necessary #defines needed before interpreterProxy. Basically internal plugins use the VM's interpreterProxy variable and external plugins use their own. Override to keep local copies of all functions in external prims, and link directly in internal plugins." "| pcc | pcc := self new. (InterpreterProxy selectors reject: [:s| #(initialize private) includes: (InterpreterProxy whichCategoryIncludesSelector: s)]) do: [:s| pcc noteUsedPluginFunction: s]. pcc preDeclareInterpreterProxyOn: Transcript. Transcript flush" | pluginFuncs interpreterClass objectMemoryClass | (pluginFuncs := self pluginFunctionsToClone) isEmpty ifTrue: [^super preDeclareInterpreterProxyOn: aStream]. aStream cr; nextPutAll: '#if !!defined(SQUEAK_BUILTIN_PLUGIN)'; cr. interpreterClass := self referenceInterpreterClass. objectMemoryClass := self referenceObjectMemoryClass. pluginFuncs := pluginFuncs collect: [:selector| | reference actual | reference := self compileToTMethodSelector: selector in: ((interpreterClass whichClassIncludesSelector: selector) ifNil: [(objectMemoryClass whichClassIncludesSelector: selector) ifNil: [InterpreterProxy]]). actual := self compileToTMethodSelector: selector in: InterpreterProxy. (reference returnType ~= actual returnType or: [(1 to: reference args size) anySatisfy: [:i| (reference typeFor: (reference args at: i) in: self) ~= (actual typeFor: (actual args at: i) in: self)]]) ifTrue: [self logger nextPutAll: 'warning, signature of InterpreterProxy>>'; nextPutAll: selector; nextPutAll: ' does not match reference implementation.'; cr]. actual]. pluginFuncs do: [:tMethod| tMethod recordDeclarationsIn: self. tMethod returnType ifNil: [tMethod inferReturnTypeIn: self]]. pluginFuncs do: [:tMethod| | functionName | functionName := self cFunctionNameFor: tMethod selector. aStream nextPutAll: ((String streamContents: [:s| tMethod static: true; emitCFunctionPrototype: s generator: self]) copyReplaceAll: functionName with: '(*', functionName, ')' + tokenish: [:ch| ch = $_ or: [ch isAlphaNumeric]])]. - tokenish: [:ch| ch = $_ or: [ch isAlphaNumeric]]). - aStream nextPut: $;; cr]. aStream nextPutAll: '#else /* !!defined(SQUEAK_BUILTIN_PLUGIN) */'. pluginFuncs do: [:tMethod| self withOptionalVerbiageFor: tMethod selector on: aStream do: [aStream cr. tMethod static: false; export: false; emitCFunctionPrototype: aStream generator: self. aStream nextPut: $;] ifOptionalDo: [aStream cr; nextPutAll: '# define '. (TSendNode new setSelector: tMethod selector receiver: (TVariableNode new setName: 'interpreterProxy') arguments: (tMethod args collect: [:a| TVariableNode new setName: a])) emitCCodeAsArgumentOn: aStream level: 0 generator: self. aStream nextPutAll: ' 0']]. aStream cr; nextPutAll: 'extern'. aStream cr; nextPutAll: '#endif'; cr! Item was changed: ----- Method: VMPluginCodeGenerator>>storeVirtualMachineProxyImplementation:on: (in category 'private') ----- storeVirtualMachineProxyImplementation: categoryList on: fileName "Store the interpreter definitions on the given file" | stream | stream := FileStream newFileNamed: fileName. stream nextPutAll:' #include <math.h> #include <stdio.h> #include <stdlib.h> #include <string.h> #include <time.h> #include "sqVirtualMachine.h"'; cr;cr. stream nextPutAll:'/*** Function prototypes ***/'. categoryList do:[:assoc| stream cr; cr; nextPutAll:'/* InterpreterProxy methodsFor: ''',assoc key, ''' */'; cr. (self sortStrings: assoc value) do:[:sel| + (methods at: sel) emitCFunctionPrototype: stream generator: self]]. - (methods at: sel) emitCFunctionPrototype: stream generator: self. - stream nextPut: $;; cr]]. stream cr; nextPutAll:'struct VirtualMachine *VM = NULL;'; cr. stream cr; nextPutAll: 'static int majorVersion(void) { return VM_PROXY_MAJOR; } static int minorVersion(void) { return VM_PROXY_MINOR; } struct VirtualMachine* sqGetInterpreterProxy(void) { if(VM) return VM; VM = (struct VirtualMachine *) calloc(1, sizeof(VirtualMachine)); /* Initialize Function pointers */ VM->majorVersion = majorVersion; VM->minorVersion = minorVersion; '. categoryList do:[:assoc| stream cr; crtab; nextPutAll:'/* InterpreterProxy methodsFor: ''',assoc key, ''' */'; crtab. assoc value asSortedCollection do:[:sel| stream nextPutAll:'VM->'; nextPutAll: (self cFunctionNameFor: sel); nextPutAll:' = '; nextPutAll: (self cFunctionNameFor: sel); nextPutAll:';'; crtab]]. stream cr; crtab; nextPutAll:'return VM;'; cr; nextPutAll:'}'; cr. stream close.!

1 0

[commit][3590] Mac OS makefiles.
by commits＠squeakvm.org 12 Feb '16

12 Feb '16

Revision: 3590 Author: eliot Date: 2016-02-12 11:45:55 -0800 (Fri, 12 Feb 2016) Log Message: ----------- Mac OS makefiles. Touch the .app once it is made so it looks recently updated. Ignore installed sources. Modified Paths: -------------- branches/Cog/build.macos32x86/common/Makefile.app branches/Cog/build.macos64x64/common/Makefile.app Property Changed: ---------------- branches/Cog/build.macos32x86/newspeak.cog.spur/ branches/Cog/build.macos32x86/newspeak.stack.spur/ branches/Cog/build.macos32x86/pharo.cog.spur/ branches/Cog/build.macos32x86/squeak+immutability.cog.spur/ branches/Cog/build.macos32x86/squeak.cog.spur/ branches/Cog/build.macos32x86/squeak.cog.v3/ branches/Cog/build.macos32x86/squeak.sista.spur/ branches/Cog/build.macos32x86/squeak.stack.spur/ branches/Cog/build.macos32x86/squeak.stack.v3/ branches/Cog/build.macos64x64/newspeak.cog.spur/ branches/Cog/build.macos64x64/newspeak.stack.spur/ branches/Cog/build.macos64x64/pharo.cog.spur/ branches/Cog/build.macos64x64/squeak.cog.spur/ branches/Cog/build.macos64x64/squeak.sista.spur/ branches/Cog/build.macos64x64/squeak.stack.spur/ branches/Cog/platforms/Cross/vm/sqSCCSVersion.h Modified: branches/Cog/build.macos32x86/common/Makefile.app =================================================================== --- branches/Cog/build.macos32x86/common/Makefile.app 2016-02-12 19:32:34 UTC (rev 3589) +++ branches/Cog/build.macos32x86/common/Makefile.app 2016-02-12 19:45:55 UTC (rev 3590) @@ -63,7 +63,7 @@ $(APP): $(VMEXE) $(VMBUNDLES) $(VMPLIST) $(VMMENUNIB) $(VMICONS) $(SOURCES) \ - $(APPPOST) signapp + $(APPPOST) signapp touchapp $(VMEXE): $(OBJDIR)/$(VM) mkdir -p $(APP)/Contents/MacOS @@ -104,6 +104,9 @@ codesign -f --deep -s "$(SIGNING_IDENTITY)" $(APP) endif +touchapp: + touch $(APP) + # source installation %.sources: ../../sources/%.sources ln $< $@ Property changes on: branches/Cog/build.macos32x86/newspeak.cog.spur ___________________________________________________________________ Modified: svn:ignore - Cocoa*.app LOG* build* deps getversion* sqNamedPrims.h + Cocoa*.app LOG* *.sources build* deps getversion* sqNamedPrims.h Property changes on: branches/Cog/build.macos32x86/newspeak.stack.spur ___________________________________________________________________ Modified: svn:ignore - Cocoa*.app LOG* build* deps getversion* sqNamedPrims.h + Cocoa*.app LOG* *.sources build* deps getversion* sqNamedPrims.h Property changes on: branches/Cog/build.macos32x86/pharo.cog.spur ___________________________________________________________________ Modified: svn:ignore - Cocoa*.app LOG* build* deps getversion* sqNamedPrims.h + Cocoa*.app LOG* *.sources build* deps getversion* sqNamedPrims.h Property changes on: branches/Cog/build.macos32x86/squeak+immutability.cog.spur ___________________________________________________________________ Modified: svn:ignore - Cocoa*.app LOG* build* deps getversion* sqNamedPrims.h + Cocoa*.app LOG* *.sources build* deps getversion* sqNamedPrims.h Property changes on: branches/Cog/build.macos32x86/squeak.cog.spur ___________________________________________________________________ Modified: svn:ignore - Cocoa*.app LOG* build* deps getversion* sqNamedPrims.h + Cocoa*.app LOG* *.sources build* deps getversion* sqNamedPrims.h Property changes on: branches/Cog/build.macos32x86/squeak.cog.v3 ___________________________________________________________________ Modified: svn:ignore - Cocoa*.app LOG* build* deps getversion* sqNamedPrims.h + Cocoa*.app LOG* *.sources build* deps getversion* sqNamedPrims.h Property changes on: branches/Cog/build.macos32x86/squeak.sista.spur ___________________________________________________________________ Modified: svn:ignore - Cocoa*.app LOG* build* deps getversion* sqNamedPrims.h + Cocoa*.app LOG* *.sources build* deps getversion* sqNamedPrims.h Property changes on: branches/Cog/build.macos32x86/squeak.stack.spur ___________________________________________________________________ Modified: svn:ignore - Cocoa*.app LOG* build* deps getversion* sqNamedPrims.h + Cocoa*.app LOG* *.sources build* deps getversion* sqNamedPrims.h Property changes on: branches/Cog/build.macos32x86/squeak.stack.v3 ___________________________________________________________________ Modified: svn:ignore - Cocoa*.app LOG* build* deps getversion* sqNamedPrims.h + Cocoa*.app LOG* *.sources build* deps getversion* sqNamedPrims.h Modified: branches/Cog/build.macos64x64/common/Makefile.app =================================================================== --- branches/Cog/build.macos64x64/common/Makefile.app 2016-02-12 19:32:34 UTC (rev 3589) +++ branches/Cog/build.macos64x64/common/Makefile.app 2016-02-12 19:45:55 UTC (rev 3590) @@ -63,7 +63,7 @@ $(APP): $(VMEXE) $(VMBUNDLES) $(VMPLIST) $(VMMENUNIB) $(VMICONS) $(SOURCES) \ - $(APPPOST) signapp + $(APPPOST) signapp touchapp $(VMEXE): $(OBJDIR)/$(VM) mkdir -p $(APP)/Contents/MacOS @@ -104,6 +104,9 @@ codesign -f --deep -s "$(SIGNING_IDENTITY)" $(APP) endif +touchapp: + touch $(APP) + # source installation %.sources: ../../sources/%.sources ln $< $@ Property changes on: branches/Cog/build.macos64x64/newspeak.cog.spur ___________________________________________________________________ Modified: svn:ignore - Cocoa*.app LOG* build* deps getversion* sqNamedPrims.h + Cocoa*.app LOG* *.sources build* deps getversion* sqNamedPrims.h Property changes on: branches/Cog/build.macos64x64/newspeak.stack.spur ___________________________________________________________________ Modified: svn:ignore - Cocoa*.app LOG* build* deps getversion* sqNamedPrims.h + Cocoa*.app LOG* *.sources build* deps getversion* sqNamedPrims.h Property changes on: branches/Cog/build.macos64x64/pharo.cog.spur ___________________________________________________________________ Modified: svn:ignore - Cocoa*.app LOG* build* deps getversion* sqNamedPrims.h + Cocoa*.app LOG* *.sources build* deps getversion* sqNamedPrims.h Property changes on: branches/Cog/build.macos64x64/squeak.cog.spur ___________________________________________________________________ Modified: svn:ignore - Cocoa*.app LOG* build* deps getversion* sqNamedPrims.h + Cocoa*.app LOG* *.sources build* deps getversion* sqNamedPrims.h Property changes on: branches/Cog/build.macos64x64/squeak.sista.spur ___________________________________________________________________ Modified: svn:ignore - Cocoa*.app LOG* build* deps getversion* sqNamedPrims.h + Cocoa*.app LOG* *.sources build* deps getversion* sqNamedPrims.h Property changes on: branches/Cog/build.macos64x64/squeak.stack.spur ___________________________________________________________________ Modified: svn:ignore - Cocoa*.app LOG* build* deps getversion* sqNamedPrims.h + Cocoa*.app LOG* *.sources build* deps getversion* sqNamedPrims.h Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h ___________________________________________________________________ Modified: checkindate - Fri Feb 12 11:30:58 PST 2016 + Fri Feb 12 11:43:54 PST 2016

1 0

[commit][3589] Mac OS X makefiles.
by commits＠squeakvm.org 12 Feb '16

12 Feb '16

Revision: 3589 Author: eliot Date: 2016-02-12 11:32:34 -0800 (Fri, 12 Feb 2016) Log Message: ----------- Mac OS X makefiles. Add support for installing sources either into the dir or the app. Fix dependency recognition by eliminating the BASEDIR nonsense. Modified Paths: -------------- branches/Cog/build.macos32x86/common/Makefile.app branches/Cog/build.macos32x86/common/Makefile.app.newspeak branches/Cog/build.macos32x86/common/Makefile.plugin branches/Cog/build.macos32x86/common/Makefile.rules branches/Cog/build.macos32x86/common/Makefile.vm branches/Cog/build.macos32x86/squeak+immutability.cog.spur/Makefile branches/Cog/build.macos32x86/squeak.cog.spur/Makefile branches/Cog/build.macos32x86/squeak.cog.v3/Makefile branches/Cog/build.macos32x86/squeak.sista.spur/Makefile branches/Cog/build.macos32x86/squeak.stack.spur/Makefile branches/Cog/build.macos32x86/squeak.stack.v3/Makefile branches/Cog/build.macos64x64/common/Makefile.app branches/Cog/build.macos64x64/common/Makefile.app.newspeak branches/Cog/build.macos64x64/common/Makefile.plugin branches/Cog/build.macos64x64/common/Makefile.rules branches/Cog/build.macos64x64/common/Makefile.vm branches/Cog/build.macos64x64/squeak.cog.spur/Makefile branches/Cog/build.macos64x64/squeak.sista.spur/Makefile branches/Cog/build.macos64x64/squeak.stack.spur/Makefile Property Changed: ---------------- branches/Cog/platforms/Cross/vm/sqSCCSVersion.h Modified: branches/Cog/build.macos32x86/common/Makefile.app =================================================================== --- branches/Cog/build.macos32x86/common/Makefile.app 2016-02-12 00:14:11 UTC (rev 3588) +++ branches/Cog/build.macos32x86/common/Makefile.app 2016-02-12 19:32:34 UTC (rev 3589) @@ -12,6 +12,10 @@ # # The name of the VM to build. Optional. Defaults to Squeak # +# SOURCEFILE the Smalltalk source file to link into this directory. Optional. +# +# APPSOURCE the Smalltalk source file to link into the app Resource. Optional. +# # PLUGINSRCDIR defines the locaton of the plugin source, the subsets of which # selected by plugins.int and plugins.ext will be built. Optional. Defaults to # ../../src @@ -49,10 +53,19 @@ OSXICONS:=$(OSXDIR)/$(VM).icns $(wildcard $(OSXDIR)/$(SYSTEM)*.icns) VMICONS:=$(addprefix $(APP)/Contents/Resources/,$(notdir $(OSXICONS))) VMMENUNIB:=$(APP)/Contents/Resources/English.lproj/MainMenu.nib +SOURCES:= +ifneq ("$(SOURCEFILE)",) +SOURCES:=./$(SOURCEFILE) +endif +ifneq ("$(APPSOURCE)",) +SOURCES:=$(SOURCES) $(APP)/Contents/Resources/$(APPSOURCE) +endif -$(APP): $(VMEXE) $(VMBUNDLES) $(VMPLIST) $(VMMENUNIB) $(VMICONS) $(APPPOST) signapp -$(VMEXE): vm $(OBJDIR)/$(VM) +$(APP): $(VMEXE) $(VMBUNDLES) $(VMPLIST) $(VMMENUNIB) $(VMICONS) $(SOURCES) \ + $(APPPOST) signapp + +$(VMEXE): $(OBJDIR)/$(VM) mkdir -p $(APP)/Contents/MacOS cp -p $(OBJDIR)/$(VM) $(APP)/Contents/MacOS @@ -91,6 +104,13 @@ codesign -f --deep -s "$(SIGNING_IDENTITY)" $(APP) endif +# source installation +%.sources: ../../sources/%.sources + ln $< $@ + +$(APP)/Contents/Resources/%.sources: ../../sources/%.sources + ln $< $@ + print-app-settings: @echo ---------------- Makefile.app settings ------------------ @echo APP=$(APP) Modified: branches/Cog/build.macos32x86/common/Makefile.app.newspeak =================================================================== --- branches/Cog/build.macos32x86/common/Makefile.app.newspeak 2016-02-12 00:14:11 UTC (rev 3588) +++ branches/Cog/build.macos32x86/common/Makefile.app.newspeak 2016-02-12 19:32:34 UTC (rev 3589) @@ -7,6 +7,7 @@ VM:=NewspeakVirtualMachine SYSTEM:=Newspeak +APPSOURCE:=SqueakV50.sources APPPOST:=renameExe renameIcon Modified: branches/Cog/build.macos32x86/common/Makefile.plugin =================================================================== --- branches/Cog/build.macos32x86/common/Makefile.plugin 2016-02-12 00:14:11 UTC (rev 3588) +++ branches/Cog/build.macos32x86/common/Makefile.plugin 2016-02-12 19:32:34 UTC (rev 3589) @@ -34,8 +34,7 @@ # PLUGINSRCDIR: Where is the root of the src/plugins source tree? # VMSRCDIR: Where is the root of the src vm source tree? # PLATDIR: Where is the root of the platforms tree? -# BASEDIR: Where is the root of the build tree? -COMMONDIR:=$(BASEDIR)/../common +COMMONDIR:=../common ############################################################################# # Standard directory locations: @@ -50,7 +49,7 @@ OSXPLGDIR:= $(PLATDIR)/iOS/plugins/$(LIBNAME) UNIXDIR:= $(PLATDIR)/unix/vm MAKERDIR:= $(PLUGINSRCDIR)/$(LIBNAME) -BUILDDIR:= $(BASEDIR)/$(BUILD)/$(LIBNAME) +BUILDDIR:= $(BUILD)/$(LIBNAME) # Support directory locations CROSSVMDIR:=$(PLATDIR)/Cross/vm @@ -86,8 +85,8 @@ ############################################################################# # Plugin settings # -OBJDIR:= $(BASEDIR)/$(BUILD)/$(LIBNAME) -VMDIR:= $(BASEDIR)/$(BUILD)/vm +OBJDIR:= $(BUILD)/$(LIBNAME) +VMDIR:= $(BUILD)/vm PLUGINLIB:= $(VMDIR)/$(LIBNAME).lib PLUGINBUNDLE:= $(VMDIR)/$(LIBNAME).bundle PLUGINEXE:= $(PLUGINBUNDLE)/Contents/MacOS/$(LIBNAME) @@ -132,6 +131,7 @@ @echo PLUGINLIB=$(PLUGINLIB) @echo PLUGINEXE=$(PLUGINEXE) @echo PLUGINBUNDLE=$(PLUGINBUNDLE) + @echo deps=$(patsubst %,deps/%.d,$(notdir $(basename $(VMSRC)))) @echo ----------------------------------------------------- $(OBJDIR): Modified: branches/Cog/build.macos32x86/common/Makefile.rules =================================================================== --- branches/Cog/build.macos32x86/common/Makefile.rules 2016-02-12 00:14:11 UTC (rev 3588) +++ branches/Cog/build.macos32x86/common/Makefile.rules 2016-02-12 19:32:34 UTC (rev 3589) @@ -14,24 +14,22 @@ DEPFLAGS = -MT $@ -MMD -MP -MF deps/$(*F).Td ALLFLAGS = $(DEPFLAGS) $(WARNINGS) $(CFLAGS) #POSTCOMPILE = mv -f deps/$(*F).Td deps/$(*F).d -POSTCOMPILE = sed '/^$$/d' <deps/$(*F).Td | sed '/^.*:$$/d' > deps/$(*F).d; rm deps/$(*F).Td +POSTCOMPILE = sed '/^$$/d' <deps/$(*F).Td | sed '/^.*:$$/d' > deps/$(*F).d; rm deps/$(*F).Td; touch -r $< deps/$(*F).d -$(OBJDIR)/%.o: %.c $(OBJDIR)/%.o: %.c deps/%.d $(CC) -x c $(ALLFLAGS) $(INCLUDES) -c $< -o $@ $(POSTCOMPILE) -$(OBJDIR)/%.o: %.m $(OBJDIR)/%.o: %.m deps/%.d $(CC) -x objective-c $(ALLFLAGS) $(INCLUDES) -c $< -o $@ $(POSTCOMPILE) -$(OBJDIR)/%.o: %.cpp $(OBJDIR)/%.o: %.cpp deps/%.d $(CC) -x c++ $(ALLFLAGS) $(INCLUDES) -c $< -o $@ $(POSTCOMPILE) deps/%.d: ; + .PRECIOUS: deps/%.d --include $(patsubst %,deps/%.d,$(basename $(VMSRC))) +-include $(patsubst %,deps/%.d,$(notdir $(basename $(VMSRC)))) Modified: branches/Cog/build.macos32x86/common/Makefile.vm =================================================================== --- branches/Cog/build.macos32x86/common/Makefile.vm 2016-02-12 00:14:11 UTC (rev 3588) +++ branches/Cog/build.macos32x86/common/Makefile.vm 2016-02-12 19:32:34 UTC (rev 3589) @@ -30,10 +30,7 @@ ############################################################################# # Build directories # -ifndef BASEDIR -BASEDIR:=. -endif -COMMONDIR:=$(BASEDIR)/../common +COMMONDIR:=../common ifeq ("$(CONFIGURATION)","assert") BUILD:=buildast @@ -43,7 +40,7 @@ BUILD:=build endif $(shell mkdir -p deps >/dev/null) # deps is the dependencies directory -BLDDIR:= $(BASEDIR)/$(BUILD) +BLDDIR:= $(BUILD) OBJDIR:= $(BLDDIR)/vm # N.B. PLATDIR *must* be a relative path, see -f../../$(shell test -f ...) below @@ -132,7 +129,6 @@ svnver: @-echo $(SVNREV) -getversion: $(OSXCOMMONDIR)/version.c $(CROSSDIR)/sqSCCSVersion.h getversion: $(OSXCOMMONDIR)/version.c deps/version.d $(CROSSDIR)/sqSCCSVersion.h $(CC) -x c -DVERSION_PROGRAM=1 $(ALLFLAGS) $(INCLUDES) $< -o $@ $(POSTCOMPILE) @@ -181,7 +177,7 @@ @echo OBJDIR=$(OBJDIR) @echo LIBS=$(LIBS) @echo BUNDLES=$(BUNDLES) - @echo MAKEFILE=$(MAKEFILE) + @echo deps=$(patsubst %,deps/%.d,$(notdir $(basename $(VMSRC)))) @echo ----------------------------------------------------- print-objects: @@ -189,7 +185,7 @@ @echo VMOBJ=$(VMOBJ) @echo ----------------------------------------------------- -vm: $(OBJDIR)/$(VM) +#vm: $(OBJDIR)/$(VM) $(OBJDIR)/$(VM): $(OBJDIR) $(VMOBJ) $(LIBS) $(CC) -arch $(TARGET_ARCH) -o $(OBJDIR)/version.o $(CFLAGS) $(INCLUDES) $(DEFS) -c $(OSXCOMMONDIR)/version.c @@ -209,7 +205,7 @@ ############################################################################# # Building plugins # -.PHONY: $(OBJDIR)/%.lib $(OBJDIR)/%.bundle %.lib %.bundle +.PHONY: $(OBJDIR)/%.lib $(OBJDIR)/%.bundle plugin-makefile = $(shell test -f $(OSXPLUGINSDIR)/$(1)/Makefile && echo $(OSXPLUGINSDIR)/$(1)/Makefile || echo $(COMMONDIR)/Makefile.plugin) @@ -222,8 +218,7 @@ $(MAKE) $(MFLAGS) BUILD=$(BUILD) \ -f $(call plugin-makefile,$(*F)) MAKEFILE=$(call plugin-makefile,$(*F)) \ CONFIGURATION=$(CONFIGURATION) ARCH=$(TARGET_ARCH) \ - PLATDIR=$(PLATDIR) BASEDIR=$(BASEDIR) \ - PLUGINSRCDIR=$(PLUGINSRCDIR) VMSRCDIR=$(VMSRCDIR) \ + PLATDIR=$(PLATDIR) PLUGINSRCDIR=$(PLUGINSRCDIR) VMSRCDIR=$(VMSRCDIR) \ LIBNAME=$(*F) COGDEFS="$(COGDEFS)" XDEFS=-DSQUEAK_BUILTIN_PLUGIN \ $(PLUGINHACK) \ $(OBJDIR)/$(*F).lib @@ -240,8 +235,7 @@ $(MAKE) $(MFLAGS) BUILD=$(BUILD) \ -f $(call plugin-makefile,$(*F)) MAKEFILE=$(call plugin-makefile,$(*F)) \ CONFIGURATION=$(CONFIGURATION) ARCH=$(TARGET_ARCH) \ - PLATDIR=$(PLATDIR) BASEDIR=$(BASEDIR) \ - PLUGINSRCDIR=$(PLUGINSRCDIR) VMSRCDIR=$(VMSRCDIR) \ + PLATDIR=$(PLATDIR) PLUGINSRCDIR=$(PLUGINSRCDIR) VMSRCDIR=$(VMSRCDIR) \ LIBNAME=$(*F) COGDEFS="$(COGDEFS)" \ $(PLUGINHACK) \ $(OBJDIR)/$(*F).bundle @@ -250,6 +244,8 @@ #%.bundle: $(OBJDIR)/%.bundle # make $(MAKEFLAGS) $< +.PRECIOUS: $(OBJDIR)/%.lib $(OBJDIR)/%.bundle + ############################################################################# # Extra specific dependencies # Modified: branches/Cog/build.macos32x86/squeak+immutability.cog.spur/Makefile =================================================================== --- branches/Cog/build.macos32x86/squeak+immutability.cog.spur/Makefile 2016-02-12 00:14:11 UTC (rev 3588) +++ branches/Cog/build.macos32x86/squeak+immutability.cog.spur/Makefile 2016-02-12 19:32:34 UTC (rev 3589) @@ -4,6 +4,8 @@ # VMSRCDIR:= ../../spursrc/vm +SOURCEFILE:=SqueakV50.sources + COGDEFS=-DIMMUTABILITY=1 # Now include the Makefile proper, which is common to all Mac OS builds. Modified: branches/Cog/build.macos32x86/squeak.cog.spur/Makefile =================================================================== --- branches/Cog/build.macos32x86/squeak.cog.spur/Makefile 2016-02-12 00:14:11 UTC (rev 3588) +++ branches/Cog/build.macos32x86/squeak.cog.spur/Makefile 2016-02-12 19:32:34 UTC (rev 3589) @@ -4,6 +4,7 @@ # VMSRCDIR:= ../../spursrc/vm +SOURCEFILE:=SqueakV50.sources # Now include the Makefile proper, which is common to all Mac OS builds. # Modified: branches/Cog/build.macos32x86/squeak.cog.v3/Makefile =================================================================== --- branches/Cog/build.macos32x86/squeak.cog.v3/Makefile 2016-02-12 00:14:11 UTC (rev 3588) +++ branches/Cog/build.macos32x86/squeak.cog.v3/Makefile 2016-02-12 19:32:34 UTC (rev 3589) @@ -4,14 +4,8 @@ # VMSRCDIR:= ../../src/vm +SOURCEFILE:=SqueakV46.sources -APPPOST:=overwriteSqueakIcon - # Now include the Makefile proper, which is common to all Mac OS builds. # -include ../common/Makefile.app - -# Replace the standard yellow VM icon with the green one used for Cog VMs - -overwriteSqueakIcon: $(APP)/Contents/Resources/Squeak.icns - cp -p $(OSXDIR)/GreenCogSqueak.icns $(APP)/Contents/Resources/Squeak.icns +include ../common/Makefile.app.squeak.cog Modified: branches/Cog/build.macos32x86/squeak.sista.spur/Makefile =================================================================== --- branches/Cog/build.macos32x86/squeak.sista.spur/Makefile 2016-02-12 00:14:11 UTC (rev 3588) +++ branches/Cog/build.macos32x86/squeak.sista.spur/Makefile 2016-02-12 19:32:34 UTC (rev 3589) @@ -4,6 +4,7 @@ # VMSRCDIR:= ../../spursistasrc/vm +SOURCEFILE:=SqueakV50.sources APPPOST:=overwriteSqueakIcon Modified: branches/Cog/build.macos32x86/squeak.stack.spur/Makefile =================================================================== --- branches/Cog/build.macos32x86/squeak.stack.spur/Makefile 2016-02-12 00:14:11 UTC (rev 3588) +++ branches/Cog/build.macos32x86/squeak.stack.spur/Makefile 2016-02-12 19:32:34 UTC (rev 3589) @@ -4,6 +4,7 @@ # VMSRCDIR:= ../../spurstacksrc/vm +SOURCEFILE:=SqueakV50.sources # Now include the Makefile proper, which is common to all Mac OS builds. # Modified: branches/Cog/build.macos32x86/squeak.stack.v3/Makefile =================================================================== --- branches/Cog/build.macos32x86/squeak.stack.v3/Makefile 2016-02-12 00:14:11 UTC (rev 3588) +++ branches/Cog/build.macos32x86/squeak.stack.v3/Makefile 2016-02-12 19:32:34 UTC (rev 3589) @@ -4,6 +4,7 @@ # VMSRCDIR:= ../../stacksrc/vm +SOURCEFILE:=SqueakV46.sources # Now include the Makefile proper, which is common to all Mac OS builds. # Modified: branches/Cog/build.macos64x64/common/Makefile.app =================================================================== --- branches/Cog/build.macos64x64/common/Makefile.app 2016-02-12 00:14:11 UTC (rev 3588) +++ branches/Cog/build.macos64x64/common/Makefile.app 2016-02-12 19:32:34 UTC (rev 3589) @@ -12,6 +12,10 @@ # # The name of the VM to build. Optional. Defaults to Squeak # +# SOURCEFILE the Smalltalk source file to link into this directory. Optional. +# +# APPSOURCE the Smalltalk source file to link into the app Resource. Optional. +# # PLUGINSRCDIR defines the locaton of the plugin source, the subsets of which # selected by plugins.int and plugins.ext will be built. Optional. Defaults to # ../../src @@ -49,10 +53,19 @@ OSXICONS:=$(OSXDIR)/$(VM).icns $(wildcard $(OSXDIR)/$(SYSTEM)*.icns) VMICONS:=$(addprefix $(APP)/Contents/Resources/,$(notdir $(OSXICONS))) VMMENUNIB:=$(APP)/Contents/Resources/English.lproj/MainMenu.nib +SOURCES:= +ifneq ("$(SOURCEFILE)",) +SOURCES:=./$(SOURCEFILE) +endif +ifneq ("$(APPSOURCE)",) +SOURCES:=$(SOURCES) $(APP)/Contents/Resources/$(APPSOURCE) +endif -$(APP): $(VMEXE) $(VMBUNDLES) $(VMPLIST) $(VMMENUNIB) $(VMICONS) $(APPPOST) signapp -$(VMEXE): vm $(OBJDIR)/$(VM) +$(APP): $(VMEXE) $(VMBUNDLES) $(VMPLIST) $(VMMENUNIB) $(VMICONS) $(SOURCES) \ + $(APPPOST) signapp + +$(VMEXE): $(OBJDIR)/$(VM) mkdir -p $(APP)/Contents/MacOS cp -p $(OBJDIR)/$(VM) $(APP)/Contents/MacOS @@ -91,6 +104,13 @@ codesign -f --deep -s "$(SIGNING_IDENTITY)" $(APP) endif +# source installation +%.sources: ../../sources/%.sources + ln $< $@ + +$(APP)/Contents/Resources/%.sources: ../../sources/%.sources + ln $< $@ + print-app-settings: @echo ---------------- Makefile.app settings ------------------ @echo APP=$(APP) Modified: branches/Cog/build.macos64x64/common/Makefile.app.newspeak =================================================================== --- branches/Cog/build.macos64x64/common/Makefile.app.newspeak 2016-02-12 00:14:11 UTC (rev 3588) +++ branches/Cog/build.macos64x64/common/Makefile.app.newspeak 2016-02-12 19:32:34 UTC (rev 3589) @@ -7,6 +7,7 @@ VM:=NewspeakVirtualMachine SYSTEM:=Newspeak +APPSOURCE:=SqueakV50.sources APPPOST:=renameExe renameIcon Modified: branches/Cog/build.macos64x64/common/Makefile.plugin =================================================================== --- branches/Cog/build.macos64x64/common/Makefile.plugin 2016-02-12 00:14:11 UTC (rev 3588) +++ branches/Cog/build.macos64x64/common/Makefile.plugin 2016-02-12 19:32:34 UTC (rev 3589) @@ -34,8 +34,7 @@ # PLUGINSRCDIR: Where is the root of the src/plugins source tree? # VMSRCDIR: Where is the root of the src vm source tree? # PLATDIR: Where is the root of the platforms tree? -# BASEDIR: Where is the root of the build tree? -COMMONDIR:=$(BASEDIR)/../common +COMMONDIR:=../common ############################################################################# # Standard directory locations: @@ -50,7 +49,7 @@ OSXPLGDIR:= $(PLATDIR)/iOS/plugins/$(LIBNAME) UNIXDIR:= $(PLATDIR)/unix/vm MAKERDIR:= $(PLUGINSRCDIR)/$(LIBNAME) -BUILDDIR:= $(BASEDIR)/$(BUILD)/$(LIBNAME) +BUILDDIR:= $(BUILD)/$(LIBNAME) # Support directory locations CROSSVMDIR:=$(PLATDIR)/Cross/vm @@ -86,8 +85,8 @@ ############################################################################# # Plugin settings # -OBJDIR:= $(BASEDIR)/$(BUILD)/$(LIBNAME) -VMDIR:= $(BASEDIR)/$(BUILD)/vm +OBJDIR:= $(BUILD)/$(LIBNAME) +VMDIR:= $(BUILD)/vm PLUGINLIB:= $(VMDIR)/$(LIBNAME).lib PLUGINBUNDLE:= $(VMDIR)/$(LIBNAME).bundle PLUGINEXE:= $(PLUGINBUNDLE)/Contents/MacOS/$(LIBNAME) @@ -132,6 +131,7 @@ @echo PLUGINLIB=$(PLUGINLIB) @echo PLUGINEXE=$(PLUGINEXE) @echo PLUGINBUNDLE=$(PLUGINBUNDLE) + @echo deps=$(patsubst %,deps/%.d,$(notdir $(basename $(VMSRC)))) @echo ----------------------------------------------------- $(OBJDIR): Modified: branches/Cog/build.macos64x64/common/Makefile.rules =================================================================== --- branches/Cog/build.macos64x64/common/Makefile.rules 2016-02-12 00:14:11 UTC (rev 3588) +++ branches/Cog/build.macos64x64/common/Makefile.rules 2016-02-12 19:32:34 UTC (rev 3589) @@ -14,24 +14,22 @@ DEPFLAGS = -MT $@ -MMD -MP -MF deps/$(*F).Td ALLFLAGS = $(DEPFLAGS) $(WARNINGS) $(CFLAGS) #POSTCOMPILE = mv -f deps/$(*F).Td deps/$(*F).d -POSTCOMPILE = sed '/^$$/d' <deps/$(*F).Td | sed '/^.*:$$/d' > deps/$(*F).d; rm deps/$(*F).Td +POSTCOMPILE = sed '/^$$/d' <deps/$(*F).Td | sed '/^.*:$$/d' > deps/$(*F).d; rm deps/$(*F).Td; touch -r $< deps/$(*F).d -$(OBJDIR)/%.o: %.c $(OBJDIR)/%.o: %.c deps/%.d $(CC) -x c $(ALLFLAGS) $(INCLUDES) -c $< -o $@ $(POSTCOMPILE) -$(OBJDIR)/%.o: %.m $(OBJDIR)/%.o: %.m deps/%.d $(CC) -x objective-c $(ALLFLAGS) $(INCLUDES) -c $< -o $@ $(POSTCOMPILE) -$(OBJDIR)/%.o: %.cpp $(OBJDIR)/%.o: %.cpp deps/%.d $(CC) -x c++ $(ALLFLAGS) $(INCLUDES) -c $< -o $@ $(POSTCOMPILE) deps/%.d: ; + .PRECIOUS: deps/%.d --include $(patsubst %,deps/%.d,$(basename $(VMSRC))) +-include $(patsubst %,deps/%.d,$(notdir $(basename $(VMSRC)))) Modified: branches/Cog/build.macos64x64/common/Makefile.vm =================================================================== --- branches/Cog/build.macos64x64/common/Makefile.vm 2016-02-12 00:14:11 UTC (rev 3588) +++ branches/Cog/build.macos64x64/common/Makefile.vm 2016-02-12 19:32:34 UTC (rev 3589) @@ -30,10 +30,7 @@ ############################################################################# # Build directories # -ifndef BASEDIR -BASEDIR:=. -endif -COMMONDIR:=$(BASEDIR)/../common +COMMONDIR:=../common ifeq ("$(CONFIGURATION)","assert") BUILD:=buildast @@ -43,7 +40,7 @@ BUILD:=build endif $(shell mkdir -p deps >/dev/null) # deps is the dependencies directory -BLDDIR:= $(BASEDIR)/$(BUILD) +BLDDIR:= $(BUILD) OBJDIR:= $(BLDDIR)/vm # N.B. PLATDIR *must* be a relative path, see -f../../$(shell test -f ...) below @@ -132,7 +129,6 @@ svnver: @-echo $(SVNREV) -getversion: $(OSXCOMMONDIR)/version.c $(CROSSDIR)/sqSCCSVersion.h getversion: $(OSXCOMMONDIR)/version.c deps/version.d $(CROSSDIR)/sqSCCSVersion.h $(CC) -x c -DVERSION_PROGRAM=1 $(ALLFLAGS) $(INCLUDES) $< -o $@ $(POSTCOMPILE) @@ -181,7 +177,7 @@ @echo OBJDIR=$(OBJDIR) @echo LIBS=$(LIBS) @echo BUNDLES=$(BUNDLES) - @echo MAKEFILE=$(MAKEFILE) + @echo deps=$(patsubst %,deps/%.d,$(notdir $(basename $(VMSRC)))) @echo ----------------------------------------------------- print-objects: @@ -189,7 +185,7 @@ @echo VMOBJ=$(VMOBJ) @echo ----------------------------------------------------- -vm: $(OBJDIR)/$(VM) +#vm: $(OBJDIR)/$(VM) $(OBJDIR)/$(VM): $(OBJDIR) $(VMOBJ) $(LIBS) $(CC) -arch $(TARGET_ARCH) -o $(OBJDIR)/version.o $(CFLAGS) $(INCLUDES) $(DEFS) -c $(OSXCOMMONDIR)/version.c @@ -209,7 +205,7 @@ ############################################################################# # Building plugins # -.PHONY: $(OBJDIR)/%.lib $(OBJDIR)/%.bundle %.lib %.bundle +.PHONY: $(OBJDIR)/%.lib $(OBJDIR)/%.bundle plugin-makefile = $(shell test -f $(OSXPLUGINSDIR)/$(1)/Makefile && echo $(OSXPLUGINSDIR)/$(1)/Makefile || echo $(COMMONDIR)/Makefile.plugin) @@ -222,8 +218,7 @@ $(MAKE) $(MFLAGS) BUILD=$(BUILD) \ -f $(call plugin-makefile,$(*F)) MAKEFILE=$(call plugin-makefile,$(*F)) \ CONFIGURATION=$(CONFIGURATION) ARCH=$(TARGET_ARCH) \ - PLATDIR=$(PLATDIR) BASEDIR=$(BASEDIR) \ - PLUGINSRCDIR=$(PLUGINSRCDIR) VMSRCDIR=$(VMSRCDIR) \ + PLATDIR=$(PLATDIR) PLUGINSRCDIR=$(PLUGINSRCDIR) VMSRCDIR=$(VMSRCDIR) \ LIBNAME=$(*F) COGDEFS="$(COGDEFS)" XDEFS=-DSQUEAK_BUILTIN_PLUGIN \ $(PLUGINHACK) \ $(OBJDIR)/$(*F).lib @@ -240,8 +235,7 @@ $(MAKE) $(MFLAGS) BUILD=$(BUILD) \ -f $(call plugin-makefile,$(*F)) MAKEFILE=$(call plugin-makefile,$(*F)) \ CONFIGURATION=$(CONFIGURATION) ARCH=$(TARGET_ARCH) \ - PLATDIR=$(PLATDIR) BASEDIR=$(BASEDIR) \ - PLUGINSRCDIR=$(PLUGINSRCDIR) VMSRCDIR=$(VMSRCDIR) \ + PLATDIR=$(PLATDIR) PLUGINSRCDIR=$(PLUGINSRCDIR) VMSRCDIR=$(VMSRCDIR) \ LIBNAME=$(*F) COGDEFS="$(COGDEFS)" \ $(PLUGINHACK) \ $(OBJDIR)/$(*F).bundle @@ -250,6 +244,8 @@ #%.bundle: $(OBJDIR)/%.bundle # make $(MAKEFLAGS) $< +.PRECIOUS: $(OBJDIR)/%.lib $(OBJDIR)/%.bundle + ############################################################################# # Extra specific dependencies # Modified: branches/Cog/build.macos64x64/squeak.cog.spur/Makefile =================================================================== --- branches/Cog/build.macos64x64/squeak.cog.spur/Makefile 2016-02-12 00:14:11 UTC (rev 3588) +++ branches/Cog/build.macos64x64/squeak.cog.spur/Makefile 2016-02-12 19:32:34 UTC (rev 3589) @@ -4,6 +4,7 @@ # VMSRCDIR:= ../../spursrc/vm +SOURCEFILE:=SqueakV50.sources # Now include the Makefile proper, which is common to all Mac OS builds. # Modified: branches/Cog/build.macos64x64/squeak.sista.spur/Makefile =================================================================== --- branches/Cog/build.macos64x64/squeak.sista.spur/Makefile 2016-02-12 00:14:11 UTC (rev 3588) +++ branches/Cog/build.macos64x64/squeak.sista.spur/Makefile 2016-02-12 19:32:34 UTC (rev 3589) @@ -4,6 +4,7 @@ # VMSRCDIR:= ../../spursistasrc/vm +SOURCEFILE:=SqueakV50.sources APPPOST:=overwriteSqueakIcon Modified: branches/Cog/build.macos64x64/squeak.stack.spur/Makefile =================================================================== --- branches/Cog/build.macos64x64/squeak.stack.spur/Makefile 2016-02-12 00:14:11 UTC (rev 3588) +++ branches/Cog/build.macos64x64/squeak.stack.spur/Makefile 2016-02-12 19:32:34 UTC (rev 3589) @@ -4,6 +4,7 @@ # VMSRCDIR:= ../../spurstacksrc/vm +SOURCEFILE:=SqueakV50.sources # Now include the Makefile proper, which is common to all Mac OS builds. # Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h ___________________________________________________________________ Modified: checkindate - Thu Feb 11 16:11:36 PST 2016 + Fri Feb 12 11:30:58 PST 2016

1 0

[commit][3588] Mac OS X gnu makefiles.
by commits＠squeakvm.org 12 Feb '16

12 Feb '16

Revision: 3588 Author: eliot Date: 2016-02-11 16:14:11 -0800 (Thu, 11 Feb 2016) Log Message: ----------- Mac OS X gnu makefiles. Factor out the installation of green icons for squeak cog into its own makefile. Add build.macos32x86/squeak+immutability.cog.spur to test IMMUATBILITY builds. Ignore LOG* files. Modified Paths: -------------- branches/Cog/build.macos32x86/squeak.cog.spur/Makefile branches/Cog/build.macos64x64/squeak.cog.spur/Makefile Added Paths: ----------- branches/Cog/build.macos32x86/common/Makefile.app.squeak.cog branches/Cog/build.macos32x86/squeak+immutability.cog.spur/ branches/Cog/build.macos32x86/squeak+immutability.cog.spur/Makefile branches/Cog/build.macos32x86/squeak+immutability.cog.spur/mvm branches/Cog/build.macos32x86/squeak+immutability.cog.spur/plugins.ext branches/Cog/build.macos32x86/squeak+immutability.cog.spur/plugins.int branches/Cog/build.macos64x64/common/Makefile.app.squeak.cog Property Changed: ---------------- branches/Cog/build.macos32x86/newspeak.cog.spur/ branches/Cog/build.macos32x86/newspeak.stack.spur/ branches/Cog/build.macos32x86/pharo.cog.spur/ branches/Cog/build.macos32x86/squeak.cog.spur/ branches/Cog/build.macos32x86/squeak.cog.v3/ branches/Cog/build.macos32x86/squeak.sista.spur/ branches/Cog/build.macos32x86/squeak.stack.spur/ branches/Cog/build.macos32x86/squeak.stack.v3/ branches/Cog/build.macos64x64/newspeak.cog.spur/ branches/Cog/build.macos64x64/newspeak.stack.spur/ branches/Cog/build.macos64x64/pharo.cog.spur/ branches/Cog/build.macos64x64/squeak.cog.spur/ branches/Cog/build.macos64x64/squeak.sista.spur/ branches/Cog/build.macos64x64/squeak.stack.spur/ branches/Cog/platforms/Cross/vm/sqSCCSVersion.h Added: branches/Cog/build.macos32x86/common/Makefile.app.squeak.cog =================================================================== --- branches/Cog/build.macos32x86/common/Makefile.app.squeak.cog (rev 0) +++ branches/Cog/build.macos32x86/common/Makefile.app.squeak.cog 2016-02-12 00:14:11 UTC (rev 3588) @@ -0,0 +1,17 @@ +############################################################################## +# Generic Makefile for Mac OS X Squeak Cog Cocoa VM +# + +# The caller should set VMSRCDIR to point to the relevant VM source +# e.g. VMSRCDIR:= ../../spursrc/vm + +APPPOST:=overwriteSqueakIcon + +# Now include the Makefile proper, which is common to all Mac OS builds. +# +include ../common/Makefile.app + +# Replace the standard yellow VM icon with the green one used for Cog VMs + +overwriteSqueakIcon: $(APP)/Contents/Resources/Squeak.icns + cp -p $(OSXDIR)/GreenCogSqueak.icns $(APP)/Contents/Resources/Squeak.icns Property changes on: branches/Cog/build.macos32x86/newspeak.cog.spur ___________________________________________________________________ Modified: svn:ignore - Cocoa*.app build* deps getversion* sqNamedPrims.h + Cocoa*.app LOG* build* deps getversion* sqNamedPrims.h Property changes on: branches/Cog/build.macos32x86/newspeak.stack.spur ___________________________________________________________________ Modified: svn:ignore - Cocoa*.app build* deps getversion* sqNamedPrims.h + Cocoa*.app LOG* build* deps getversion* sqNamedPrims.h Property changes on: branches/Cog/build.macos32x86/pharo.cog.spur ___________________________________________________________________ Modified: svn:ignore - Cocoa*.app build* deps getversion* sqNamedPrims.h + Cocoa*.app LOG* build* deps getversion* sqNamedPrims.h Property changes on: branches/Cog/build.macos32x86/squeak+immutability.cog.spur ___________________________________________________________________ Added: svn:ignore + Cocoa*.app LOG* build* deps getversion* sqNamedPrims.h Added: branches/Cog/build.macos32x86/squeak+immutability.cog.spur/Makefile =================================================================== --- branches/Cog/build.macos32x86/squeak+immutability.cog.spur/Makefile (rev 0) +++ branches/Cog/build.macos32x86/squeak+immutability.cog.spur/Makefile 2016-02-12 00:14:11 UTC (rev 3588) @@ -0,0 +1,11 @@ +############################################################################## +# Makefile for Mac OS X Cog Spur Squeak Cocoa VM using clang and gnu make 3.81 +# Do make init to allow make -n to function. +# + +VMSRCDIR:= ../../spursrc/vm +COGDEFS=-DIMMUTABILITY=1 + +# Now include the Makefile proper, which is common to all Mac OS builds. +# +include ../common/Makefile.app.squeak.cog Added: branches/Cog/build.macos32x86/squeak+immutability.cog.spur/mvm =================================================================== --- branches/Cog/build.macos32x86/squeak+immutability.cog.spur/mvm (rev 0) +++ branches/Cog/build.macos32x86/squeak+immutability.cog.spur/mvm 2016-02-12 00:14:11 UTC (rev 3588) @@ -0,0 +1,4 @@ +#!/bin/bash +make debug 2>&1 | tee LOGD +make assert 2>&1 | tee LOGA +make 2>&1 | tee LOGF Property changes on: branches/Cog/build.macos32x86/squeak+immutability.cog.spur/mvm ___________________________________________________________________ Added: svn:executable + * Added: branches/Cog/build.macos32x86/squeak+immutability.cog.spur/plugins.ext =================================================================== --- branches/Cog/build.macos32x86/squeak+immutability.cog.spur/plugins.ext (rev 0) +++ branches/Cog/build.macos32x86/squeak+immutability.cog.spur/plugins.ext 2016-02-12 00:14:11 UTC (rev 3588) @@ -0,0 +1,12 @@ +# Copied, perhaps edited, from ../src/examplePlugins.ext +EXTERNAL_PLUGINS = \ +BochsIA32Plugin \ +BochsX64Plugin \ +GdbARMPlugin \ +CroquetPlugin \ +FloatArrayPlugin \ +FloatMathPlugin \ +Mpeg3Plugin \ +SqueakFFIPrims \ +SqueakSSL \ +UnixOSProcessPlugin Added: branches/Cog/build.macos32x86/squeak+immutability.cog.spur/plugins.int =================================================================== --- branches/Cog/build.macos32x86/squeak+immutability.cog.spur/plugins.int (rev 0) +++ branches/Cog/build.macos32x86/squeak+immutability.cog.spur/plugins.int 2016-02-12 00:14:11 UTC (rev 3588) @@ -0,0 +1,34 @@ +# Copied, perhaps edited, from ../src/examplePlugins.int +INTERNAL_PLUGINS = \ +ADPCMCodecPlugin \ +AioPlugin \ +AsynchFilePlugin \ +B2DPlugin \ +BitBltPlugin \ +BMPReadWriterPlugin \ +ZipPlugin \ +DropPlugin \ +DSAPrims \ +FFTPlugin \ +FilePlugin \ +HostWindowPlugin \ +IA32ABI \ +JPEGReaderPlugin \ +JPEGReadWriter2Plugin \ +Klatt \ +LargeIntegers \ +LocalePlugin \ +Matrix2x3Plugin \ +MiscPrimitivePlugin \ +RePlugin \ +SecurityPlugin \ +SerialPlugin \ +SocketPlugin \ +SoundCodecPrims \ +SoundGenerationPlugin \ +SoundPlugin \ +StarSqueakPlugin \ +SurfacePlugin \ +UUIDPlugin \ +VMProfileMacSupportPlugin \ +# JoystickTabletPlugin Property changes on: branches/Cog/build.macos32x86/squeak.cog.spur ___________________________________________________________________ Modified: svn:ignore - Cocoa*.app build* deps getversion* sqNamedPrims.h + Cocoa*.app LOG* build* deps getversion* sqNamedPrims.h Modified: branches/Cog/build.macos32x86/squeak.cog.spur/Makefile =================================================================== --- branches/Cog/build.macos32x86/squeak.cog.spur/Makefile 2016-02-11 23:57:38 UTC (rev 3587) +++ branches/Cog/build.macos32x86/squeak.cog.spur/Makefile 2016-02-12 00:14:11 UTC (rev 3588) @@ -5,13 +5,6 @@ VMSRCDIR:= ../../spursrc/vm -APPPOST:=overwriteSqueakIcon - # Now include the Makefile proper, which is common to all Mac OS builds. # -include ../common/Makefile.app - -# Replace the standard yellow VM icon with the green one used for Cog VMs - -overwriteSqueakIcon: $(APP)/Contents/Resources/Squeak.icns - cp -p $(OSXDIR)/GreenCogSqueak.icns $(APP)/Contents/Resources/Squeak.icns +include ../common/Makefile.app.squeak.cog Property changes on: branches/Cog/build.macos32x86/squeak.cog.v3 ___________________________________________________________________ Modified: svn:ignore - Cocoa*.app build* deps getversion* sqNamedPrims.h + Cocoa*.app LOG* build* deps getversion* sqNamedPrims.h Property changes on: branches/Cog/build.macos32x86/squeak.sista.spur ___________________________________________________________________ Modified: svn:ignore - Cocoa*.app build* deps getversion* sqNamedPrims.h + Cocoa*.app LOG* build* deps getversion* sqNamedPrims.h Property changes on: branches/Cog/build.macos32x86/squeak.stack.spur ___________________________________________________________________ Modified: svn:ignore - build *.app *.bundle LOG* *.sources sqNamedPrims.h + Cocoa*.app LOG* build* deps getversion* sqNamedPrims.h Property changes on: branches/Cog/build.macos32x86/squeak.stack.v3 ___________________________________________________________________ Modified: svn:ignore - build *.app *.bundle LOG* *.sources sqNamedPrims.h + Cocoa*.app LOG* build* deps getversion* sqNamedPrims.h Added: branches/Cog/build.macos64x64/common/Makefile.app.squeak.cog =================================================================== --- branches/Cog/build.macos64x64/common/Makefile.app.squeak.cog (rev 0) +++ branches/Cog/build.macos64x64/common/Makefile.app.squeak.cog 2016-02-12 00:14:11 UTC (rev 3588) @@ -0,0 +1,17 @@ +############################################################################## +# Generic Makefile for Mac OS X Squeak Cog Cocoa VM +# + +# The caller should set VMSRCDIR to point to the relevant VM source +# e.g. VMSRCDIR:= ../../spursrc/vm + +APPPOST:=overwriteSqueakIcon + +# Now include the Makefile proper, which is common to all Mac OS builds. +# +include ../common/Makefile.app + +# Replace the standard yellow VM icon with the green one used for Cog VMs + +overwriteSqueakIcon: $(APP)/Contents/Resources/Squeak.icns + cp -p $(OSXDIR)/GreenCogSqueak.icns $(APP)/Contents/Resources/Squeak.icns Property changes on: branches/Cog/build.macos64x64/newspeak.cog.spur ___________________________________________________________________ Modified: svn:ignore - Cocoa*.app build* deps getversion* sqNamedPrims.h + Cocoa*.app LOG* build* deps getversion* sqNamedPrims.h Property changes on: branches/Cog/build.macos64x64/newspeak.stack.spur ___________________________________________________________________ Modified: svn:ignore - Cocoa*.app build* deps getversion* sqNamedPrims.h + Cocoa*.app LOG* build* deps getversion* sqNamedPrims.h Property changes on: branches/Cog/build.macos64x64/pharo.cog.spur ___________________________________________________________________ Modified: svn:ignore - Cocoa*.app build* deps getversion* sqNamedPrims.h + Cocoa*.app LOG* build* deps getversion* sqNamedPrims.h Property changes on: branches/Cog/build.macos64x64/squeak.cog.spur ___________________________________________________________________ Modified: svn:ignore - Cocoa*.app build* deps getversion* sqNamedPrims.h + Cocoa*.app LOG* build* deps getversion* sqNamedPrims.h Modified: branches/Cog/build.macos64x64/squeak.cog.spur/Makefile =================================================================== --- branches/Cog/build.macos64x64/squeak.cog.spur/Makefile 2016-02-11 23:57:38 UTC (rev 3587) +++ branches/Cog/build.macos64x64/squeak.cog.spur/Makefile 2016-02-12 00:14:11 UTC (rev 3588) @@ -5,13 +5,6 @@ VMSRCDIR:= ../../spursrc/vm -APPPOST:=overwriteSqueakIcon - # Now include the Makefile proper, which is common to all Mac OS builds. # -include ../common/Makefile.app - -# Replace the standard yellow VM icon with the green one used for Cog VMs - -overwriteSqueakIcon: $(APP)/Contents/Resources/Squeak.icns - cp -p $(OSXDIR)/GreenCogSqueak.icns $(APP)/Contents/Resources/Squeak.icns +include ../common/Makefile.app.squeak.cog Property changes on: branches/Cog/build.macos64x64/squeak.sista.spur ___________________________________________________________________ Modified: svn:ignore - Cocoa*.app build* deps getversion* sqNamedPrims.h + Cocoa*.app LOG* build* deps getversion* sqNamedPrims.h Property changes on: branches/Cog/build.macos64x64/squeak.stack.spur ___________________________________________________________________ Added: svn:ignore + Cocoa*.app LOG* build* deps getversion* sqNamedPrims.h Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h ___________________________________________________________________ Modified: checkindate - Thu Feb 11 15:55:53 PST 2016 + Thu Feb 11 16:11:36 PST 2016

1 0

[commit][3587] Add support for signing the Mac . app bundle if SIGNING_IDENTITY is set, e.g.
by commits＠squeakvm.org 12 Feb '16

12 Feb '16

Revision: 3587 Author: eliot Date: 2016-02-11 15:57:38 -0800 (Thu, 11 Feb 2016) Log Message: ----------- Add support for signing the Mac .app bundle if SIGNING_IDENTITY is set, e.g. via export SIGNING_IDENTITY="Developer ID Application: Eliot Miranda" Modified Paths: -------------- branches/Cog/build.macos32x86/common/Makefile.app branches/Cog/build.macos64x64/common/Makefile.app Property Changed: ---------------- branches/Cog/platforms/Cross/vm/sqSCCSVersion.h Modified: branches/Cog/build.macos32x86/common/Makefile.app =================================================================== --- branches/Cog/build.macos32x86/common/Makefile.app 2016-02-11 20:59:14 UTC (rev 3586) +++ branches/Cog/build.macos32x86/common/Makefile.app 2016-02-11 23:57:38 UTC (rev 3587) @@ -50,7 +50,7 @@ VMICONS:=$(addprefix $(APP)/Contents/Resources/,$(notdir $(OSXICONS))) VMMENUNIB:=$(APP)/Contents/Resources/English.lproj/MainMenu.nib -$(APP): $(VMEXE) $(VMBUNDLES) $(VMPLIST) $(VMMENUNIB) $(VMICONS) $(APPPOST) +$(APP): $(VMEXE) $(VMBUNDLES) $(VMPLIST) $(VMMENUNIB) $(VMICONS) $(APPPOST) signapp $(VMEXE): vm $(OBJDIR)/$(VM) mkdir -p $(APP)/Contents/MacOS @@ -80,6 +80,17 @@ mkdir -p $(APP)/Contents/Resources cp -p $< $(APP)/Contents/Resources +# To sign the app, set SIGNING_IDENTITY in the environment, e.g. +# export SIGNING_IDENTITY="Developer ID Application: Eliot Miranda" +# +ifeq ("$(SIGNING_IDENTITY)",) +signapp: + echo "No signing identity found (SIGNING_IDENTITY unset). Not signing app." +else +signapp: + codesign -f --deep -s "$(SIGNING_IDENTITY)" $(APP) +endif + print-app-settings: @echo ---------------- Makefile.app settings ------------------ @echo APP=$(APP) Modified: branches/Cog/build.macos64x64/common/Makefile.app =================================================================== --- branches/Cog/build.macos64x64/common/Makefile.app 2016-02-11 20:59:14 UTC (rev 3586) +++ branches/Cog/build.macos64x64/common/Makefile.app 2016-02-11 23:57:38 UTC (rev 3587) @@ -50,7 +50,7 @@ VMICONS:=$(addprefix $(APP)/Contents/Resources/,$(notdir $(OSXICONS))) VMMENUNIB:=$(APP)/Contents/Resources/English.lproj/MainMenu.nib -$(APP): $(VMEXE) $(VMBUNDLES) $(VMPLIST) $(VMMENUNIB) $(VMICONS) $(APPPOST) +$(APP): $(VMEXE) $(VMBUNDLES) $(VMPLIST) $(VMMENUNIB) $(VMICONS) $(APPPOST) signapp $(VMEXE): vm $(OBJDIR)/$(VM) mkdir -p $(APP)/Contents/MacOS @@ -80,6 +80,17 @@ mkdir -p $(APP)/Contents/Resources cp -p $< $(APP)/Contents/Resources +# To sign the app, set SIGNING_IDENTITY in the environment, e.g. +# export SIGNING_IDENTITY="Developer ID Application: Eliot Miranda" +# +ifeq ("$(SIGNING_IDENTITY)",) +signapp: + echo "No signing identity found (SIGNING_IDENTITY unset). Not signing app." +else +signapp: + codesign -f --deep -s "$(SIGNING_IDENTITY)" $(APP) +endif + print-app-settings: @echo ---------------- Makefile.app settings ------------------ @echo APP=$(APP) Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h ___________________________________________________________________ Modified: checkindate - Thu Feb 11 12:50:05 PST 2016 + Thu Feb 11 15:55:53 PST 2016

1 0

← Newer
1
...
9
10
11
12
13
14
15
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 February 2016