Revision: 3113 Author: eliot Date: 2014-10-24 21:40:50 -0700 (Fri, 24 Oct 2014) Log Message: ----------- Finish integrating Doug McPherson's changes for building the Stack VM on ARM:
Support building for ARM architecture 7-A (Cortex-A8, Cortex-A9, etc. see http://en.wikipedia.org/wiki/ARM_architecture) such as is used in BeagleBone Black, Parallella, countless smartphones, Chromebooks, etc, etc.
Cog/platforms/Cross/vm/ 1. replace sqAtomicOps.h 2. replace sqMemoryFence.h
Cog/platforms/unix/vm/ 1. replace sqUnixHeartbeat.c 2. replace sqUnixITimerHeartbeat.c 3. replace sqUnixITimerTickerHeartbeat.c
Cog/ 1. rename build.linux32ARMv6 to build.linux32ARM
Clean up building of BitBltPlugin and vm-display-X11 to compile/assemble only the required files based on 1) host_cpu=arm and 2) the presence of --enable-fast-bitblt option to unix/config/configure (for example in mvm scripts)
Cog/platforms/unix/config/ 1. replace make.cfg.in 2. replace configure
Cog/platforms/unix/plugins/BitBltPlugin/ 1. ******DELETE Makefile.in ******* 2. replace acinclude.m4 3. replace Makefile.inc
Cog/platforms/Cross/plugins/BitBltPlugin/ - remove the conditional compile #if defined(ENABLE_FAST_BLT) which completely surrounds the content of each of these files. Each of these is now built or not built based on autoconf magic. 1. replace BitBltArm.c 2. replace BitBltArmLinux.c 3. replace BitBltArmOther.c 4. replace BitBltArmSimd.c 5. replace BitBltDispatch.c 6. replace BitBltGeneric.c
Cog/platforms/unix/vm-display-X11/ - rename USE_FAST_BLT to ENABLE_FAST_BLT for consistency with BitBltPlugin 1. replace sqUnixX11.c 2. replace acinclude.m4 3. replace Makefile.inc
Cog/build.linux32ARM/squeak.stack.v3/build/ 1. replace mvm 2. add SqueakSSL to plugins.ext 3. should do same edits for build.debug/ and build.assert/ (and add SqueakFFIPrims and SqueakSSL)
Cog/platforms/unix/vm-display-null/ - Clean up harmless but annoying redundant compile flags in vm-display-null 1. replace Makefile.inc
Modified Paths: -------------- trunk/platforms/Cross/plugins/BitBltPlugin/BitBltArm.c trunk/platforms/Cross/plugins/BitBltPlugin/BitBltArmLinux.c trunk/platforms/Cross/plugins/BitBltPlugin/BitBltArmOther.c trunk/platforms/Cross/plugins/BitBltPlugin/BitBltArmSimd.c trunk/platforms/Cross/plugins/BitBltPlugin/BitBltDispatch.c trunk/platforms/Cross/plugins/BitBltPlugin/BitBltGeneric.c
Property Changed: ---------------- trunk/platforms/Cross/plugins/sqPluginsSCCSVersion.h
Modified: trunk/platforms/Cross/plugins/BitBltPlugin/BitBltArm.c =================================================================== --- trunk/platforms/Cross/plugins/BitBltPlugin/BitBltArm.c 2014-10-25 04:39:07 UTC (rev 3112) +++ trunk/platforms/Cross/plugins/BitBltPlugin/BitBltArm.c 2014-10-25 04:40:50 UTC (rev 3113) @@ -23,7 +23,6 @@ * */
-#if ENABLE_FAST_BLT #include "BitBltArm.h" #include "BitBltArmSimd.h"
@@ -35,4 +34,4 @@ if (armCpuFeatures & ARM_V6) addArmSimdFastPaths(); } -#endif /* ENABLE_FAST_BLT */ +
Modified: trunk/platforms/Cross/plugins/BitBltPlugin/BitBltArmLinux.c =================================================================== --- trunk/platforms/Cross/plugins/BitBltPlugin/BitBltArmLinux.c 2014-10-25 04:39:07 UTC (rev 3112) +++ trunk/platforms/Cross/plugins/BitBltPlugin/BitBltArmLinux.c 2014-10-25 04:40:50 UTC (rev 3113) @@ -25,7 +25,6 @@ * An equivalent file will be required for other ARM platforms; see BitBtArmOther.c in this directory */
-#if ENABLE_FAST_BLT #include <unistd.h> #include <sys/types.h> #include <sys/stat.h> @@ -77,4 +76,4 @@
return features; } -#endif /* ENABLE_FAST_BLT */ +
Modified: trunk/platforms/Cross/plugins/BitBltPlugin/BitBltArmOther.c =================================================================== --- trunk/platforms/Cross/plugins/BitBltPlugin/BitBltArmOther.c 2014-10-25 04:39:07 UTC (rev 3112) +++ trunk/platforms/Cross/plugins/BitBltPlugin/BitBltArmOther.c 2014-10-25 04:40:50 UTC (rev 3113) @@ -28,7 +28,6 @@ * see BitBtArmLinux.c in this directory as an example */
-#if ENABLE_FAST_BLT #include "BitBltArm.h"
/* There is no OS-neutral way of determining which type of ARM this is */ @@ -37,4 +36,4 @@ { return 0; } -#endif /* ENABLE_FAST_BLT */ +
Modified: trunk/platforms/Cross/plugins/BitBltPlugin/BitBltArmSimd.c =================================================================== --- trunk/platforms/Cross/plugins/BitBltPlugin/BitBltArmSimd.c 2014-10-25 04:39:07 UTC (rev 3112) +++ trunk/platforms/Cross/plugins/BitBltPlugin/BitBltArmSimd.c 2014-10-25 04:40:50 UTC (rev 3113) @@ -23,7 +23,6 @@ * */
-#if ENABLE_FAST_BLT #include <stddef.h> #include <stdint.h>
@@ -262,4 +261,4 @@ { addFastPaths(fastPaths, sizeof fastPaths / sizeof *fastPaths); } -#endif /* ENABLE_FAST_BLT */ +
Modified: trunk/platforms/Cross/plugins/BitBltPlugin/BitBltDispatch.c =================================================================== --- trunk/platforms/Cross/plugins/BitBltPlugin/BitBltDispatch.c 2014-10-25 04:39:07 UTC (rev 3112) +++ trunk/platforms/Cross/plugins/BitBltPlugin/BitBltDispatch.c 2014-10-25 04:40:50 UTC (rev 3113) @@ -23,7 +23,6 @@ * */
-#if ENABLE_FAST_BLT #include <stddef.h> #include<stdio.h> #include <stdlib.h> @@ -436,4 +435,4 @@ profile_record(storedCombinationRule, storedFlags, after - before); #endif } -#endif /* ENABLE_FAST_BLT */ +
Modified: trunk/platforms/Cross/plugins/BitBltPlugin/BitBltGeneric.c =================================================================== --- trunk/platforms/Cross/plugins/BitBltPlugin/BitBltGeneric.c 2014-10-25 04:39:07 UTC (rev 3112) +++ trunk/platforms/Cross/plugins/BitBltPlugin/BitBltGeneric.c 2014-10-25 04:40:50 UTC (rev 3113) @@ -23,7 +23,6 @@ * */
-#if ENABLE_FAST_BLT #include <stddef.h> #include <stdio.h> #include <stdint.h> @@ -461,4 +460,4 @@ { addFastPaths(fastPaths, sizeof fastPaths / sizeof *fastPaths); } -#endif /* ENABLE_FAST_BLT */ +
Property changes on: trunk/platforms/Cross/plugins/sqPluginsSCCSVersion.h ___________________________________________________________________ Modified: checkindate - Fri Oct 3 13:44:24 PDT 2014 + Fri Oct 24 21:40:19 PDT 2014