Vm-dev June 2013

vm-dev@lists.squeakfoundation.org

16 participants
88 discussions

VM Maker: CMakeVMMaker-GuillermoPolito.208.mcz
by commits＠source.squeak.org 19 Jun '13

19 Jun '13

Guillermo Polito uploaded a new version of CMakeVMMaker to project VM Maker: http://source.squeak.org/VMMaker/CMakeVMMaker-GuillermoPolito.208.mcz ==================== Summary ==================== Name: CMakeVMMaker-GuillermoPolito.208 Author: GuillermoPolito Time: 19 June 2013, 2:04:03.863 pm UUID: 570f3504-7464-4024-9f1c-c730c06a95d1 Ancestors: CMakeVMMaker-GuillermoPolito.207 moving to filesystem =============== Diff against CMakeVMMaker-GuillermoPolito.207 =============== Item was changed: ----- Method: CMThirdpartyLibrary>>generateFor: (in category 'generating cmake file') ----- generateFor: aVMGenerator | libDir stream contents | vmGen := aVMGenerator. gen := CMakeGenerator new output: (String new writeStream). libDir := (aVMGenerator thirdpartyDir / self canonicalName) ensureDirectory. stream := String new writeStream. self generate. stream nextPutAll: (vmGen config fixLineEndsOf: gen output contents). contents := stream contents. (self isFile: (libDir asFileReference / gen outputFileName) fullName hasContents: contents) ifFalse: [ "contents changed, update the file. Because fucking cmake will force rebuild everything if we change its modification date without changing its contents" + (FileStream forceNewFileNamed: (libDir asFileReference / gen outputFileName)) nextPutAll: contents; close. - (libDir forceNewFileNamed: gen outputFileName) nextPutAll: contents; close. ]. vmGen addSubdirectory: vmGen thirdpartyDirName , '/' , self canonicalName. self defineGlobalTargets. !

1 0

[commit][2744] add fast bitblt support files
by commits＠squeakvm.org 19 Jun '13

19 Jun '13

Revision: 2744 Author: rowledge Date: 2013-06-18 16:13:50 -0700 (Tue, 18 Jun 2013) Log Message: ----------- add fast bitblt support files Modified Paths: -------------- trunk/platforms/Cross/vm/sqMemoryAccess.h Added Paths: ----------- trunk/platforms/Cross/plugins/BitBltPlugin/ trunk/platforms/Cross/plugins/BitBltPlugin/BitBltArm.c trunk/platforms/Cross/plugins/BitBltPlugin/BitBltArm.h 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/BitBltArmSimd.h trunk/platforms/Cross/plugins/BitBltPlugin/BitBltArmSimdAlphaBlend.s trunk/platforms/Cross/plugins/BitBltPlugin/BitBltArmSimdAsm.hdr trunk/platforms/Cross/plugins/BitBltPlugin/BitBltArmSimdBitLogical.s trunk/platforms/Cross/plugins/BitBltPlugin/BitBltArmSimdPixPaint.s trunk/platforms/Cross/plugins/BitBltPlugin/BitBltArmSimdSourceWord.s trunk/platforms/Cross/plugins/BitBltPlugin/BitBltDispatch.c trunk/platforms/Cross/plugins/BitBltPlugin/BitBltDispatch.h trunk/platforms/Cross/plugins/BitBltPlugin/BitBltGeneric.c trunk/platforms/Cross/plugins/BitBltPlugin/BitBltGeneric.h trunk/platforms/Cross/plugins/BitBltPlugin/BitBltInternal.h Added: trunk/platforms/Cross/plugins/BitBltPlugin/BitBltArm.c =================================================================== --- trunk/platforms/Cross/plugins/BitBltPlugin/BitBltArm.c (rev 0) +++ trunk/platforms/Cross/plugins/BitBltPlugin/BitBltArm.c 2013-06-18 23:13:50 UTC (rev 2744) @@ -0,0 +1,36 @@ +/* + * Copyright © 2013 Raspberry Pi Foundation + * Copyright © 2013 RISC OS Open Ltd + * + * Permission to use, copy, modify, distribute, and sell this software and its + * documentation for any purpose is hereby granted without fee, provided that + * the above copyright notice appear in all copies and that both that + * copyright notice and this permission notice appear in supporting + * documentation, and that the name of the copyright holders not be used in + * advertising or publicity pertaining to distribution of the software without + * specific, written prior permission. The copyright holders make no + * representations about the suitability of this software for any purpose. It + * is provided "as is" without express or implied warranty. + * + * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS + * SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS, IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY + * SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN + * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING + * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS + * SOFTWARE. + * + */ + +#include "BitBltArm.h" +#include "BitBltArmSimd.h" + +arm_cpu_features_t armCpuFeatures; + +void addArmFastPaths(void) +{ + armCpuFeatures = detectCpuFeatures(); + if (armCpuFeatures & ARM_V6) + addArmSimdFastPaths(); +} Added: trunk/platforms/Cross/plugins/BitBltPlugin/BitBltArm.h =================================================================== --- trunk/platforms/Cross/plugins/BitBltPlugin/BitBltArm.h (rev 0) +++ trunk/platforms/Cross/plugins/BitBltPlugin/BitBltArm.h 2013-06-18 23:13:50 UTC (rev 2744) @@ -0,0 +1,44 @@ +/* + * Copyright © 2013 Raspberry Pi Foundation + * Copyright © 2013 RISC OS Open Ltd + * + * Permission to use, copy, modify, distribute, and sell this software and its + * documentation for any purpose is hereby granted without fee, provided that + * the above copyright notice appear in all copies and that both that + * copyright notice and this permission notice appear in supporting + * documentation, and that the name of the copyright holders not be used in + * advertising or publicity pertaining to distribution of the software without + * specific, written prior permission. The copyright holders make no + * representations about the suitability of this software for any purpose. It + * is provided "as is" without express or implied warranty. + * + * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS + * SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS, IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY + * SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN + * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING + * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS + * SOFTWARE. + * + */ + +#ifndef BITBLTARM_H_ +#define BITBLTARM_H_ + +typedef enum { + ARM_V7 = (1 << 0), + ARM_V6 = (1 << 1), + ARM_VFP = (1 << 2), + ARM_NEON = (1 << 3), + ARM_IWMMXT = (1 << 4) +} arm_cpu_features_t; + +extern arm_cpu_features_t armCpuFeatures; + +/* There's a separate implementation of this function for each OS */ +arm_cpu_features_t detectCpuFeatures(void); + +void addArmFastPaths(void); + +#endif /* BITBLTARM_H_ */ Added: trunk/platforms/Cross/plugins/BitBltPlugin/BitBltArmLinux.c =================================================================== --- trunk/platforms/Cross/plugins/BitBltPlugin/BitBltArmLinux.c (rev 0) +++ trunk/platforms/Cross/plugins/BitBltPlugin/BitBltArmLinux.c 2013-06-18 23:13:50 UTC (rev 2744) @@ -0,0 +1,78 @@ +/* + * Copyright © 2000 SuSE, Inc. + * Copyright © 2007 Red Hat, Inc. + * + * Permission to use, copy, modify, distribute, and sell this software and its + * documentation for any purpose is hereby granted without fee, provided that + * the above copyright notice appear in all copies and that both that + * copyright notice and this permission notice appear in supporting + * documentation, and that the name of SuSE not be used in advertising or + * publicity pertaining to distribution of the software without specific, + * written prior permission. SuSE makes no representations about the + * suitability of this software for any purpose. It is provided "as is" + * without express or implied warranty. + * + * SuSE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL SuSE + * BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION + * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN + * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + +* WRT the usage in the Squeak Smalltalk system - +* This file provides a function to discover the cpu features supported at runtime; we assume +* you understand that 'arm_cpu_features' is meaningful only on ARM cpu machines. +* An equivalent file will be required for other ARM platforms; see BitBtArmOther.c in this directory + */ + +#include <unistd.h> +#include <sys/types.h> +#include <sys/stat.h> +#include <sys/mman.h> +#include <fcntl.h> +#include <string.h> +#include <elf.h> + +#include "BitBltArm.h" + +arm_cpu_features_t detectCpuFeatures(void) +{ + arm_cpu_features_t features = 0; + Elf32_auxv_t aux; + int fd; + + fd = open ("/proc/self/auxv", O_RDONLY); + if (fd >= 0) + { + while (read (fd, &aux, sizeof(Elf32_auxv_t)) == sizeof(Elf32_auxv_t)) + { + if (aux.a_type == AT_HWCAP) + { + uint32_t hwcap = aux.a_un.a_val; + + /* hardcode these values to avoid depending on specific + * versions of the hwcap header, e.g. HWCAP_NEON + */ + if ((hwcap & 64) != 0) + features |= ARM_VFP; + if ((hwcap & 512) != 0) + features |= ARM_IWMMXT; + /* this flag is only present on kernel 2.6.29 */ + if ((hwcap & 4096) != 0) + features |= ARM_NEON; + } + else if (aux.a_type == AT_PLATFORM) + { + const char *plat = (const char*) aux.a_un.a_val; + + if (strncmp (plat, "v7l", 3) == 0) + features |= (ARM_V7 | ARM_V6); + else if (strncmp (plat, "v6l", 3) == 0) + features |= ARM_V6; + } + } + close (fd); + } + + return features; +} Added: trunk/platforms/Cross/plugins/BitBltPlugin/BitBltArmOther.c =================================================================== --- trunk/platforms/Cross/plugins/BitBltPlugin/BitBltArmOther.c (rev 0) +++ trunk/platforms/Cross/plugins/BitBltPlugin/BitBltArmOther.c 2013-06-18 23:13:50 UTC (rev 2744) @@ -0,0 +1,38 @@ +/* + * Copyright © 2013 Raspberry Pi Foundation + * Copyright © 2013 RISC OS Open Ltd + * + * Permission to use, copy, modify, distribute, and sell this software and its + * documentation for any purpose is hereby granted without fee, provided that + * the above copyright notice appear in all copies and that both that + * copyright notice and this permission notice appear in supporting + * documentation, and that the name of the copyright holders not be used in + * advertising or publicity pertaining to distribution of the software without + * specific, written prior permission. The copyright holders make no + * representations about the suitability of this software for any purpose. It + * is provided "as is" without express or implied warranty. + * + * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS + * SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS, IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY + * SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN + * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING + * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS + * SOFTWARE. + * + * WRT the usage in the Squeak Smalltalk system - +* This file provides a function to discover the cpu features supported at runtime; we assume +* you understand that 'arm_cpu_features' is meaningful only on ARM cpu machines. +* Obviously, this is a null function and a suitable equivalent file will be required for actual ARM platforms; +* see BitBtArmLinux.c in this directory as an example + */ + +#include "BitBltArm.h" + +/* There is no OS-neutral way of determining which type of ARM this is */ + +arm_cpu_features_t detectCpuFeatures(void) +{ + return 0; +} Added: trunk/platforms/Cross/plugins/BitBltPlugin/BitBltArmSimd.c =================================================================== --- trunk/platforms/Cross/plugins/BitBltPlugin/BitBltArmSimd.c (rev 0) +++ trunk/platforms/Cross/plugins/BitBltPlugin/BitBltArmSimd.c 2013-06-18 23:13:50 UTC (rev 2744) @@ -0,0 +1,263 @@ +/* + * Copyright © 2013 Raspberry Pi Foundation + * Copyright © 2013 RISC OS Open Ltd + * + * Permission to use, copy, modify, distribute, and sell this software and its + * documentation for any purpose is hereby granted without fee, provided that + * the above copyright notice appear in all copies and that both that + * copyright notice and this permission notice appear in supporting + * documentation, and that the name of the copyright holders not be used in + * advertising or publicity pertaining to distribution of the software without + * specific, written prior permission. The copyright holders make no + * representations about the suitability of this software for any purpose. It + * is provided "as is" without express or implied warranty. + * + * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS + * SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS, IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY + * SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN + * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING + * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS + * SOFTWARE. + * + */ + +#include <stddef.h> +#include <stdint.h> + +#include "BitBltInternal.h" + +enum { + HALFTONE_NONE, + HALFTONE_SCALAR, + HALFTONE_VECTOR +}; + +//typedef void (*armSimdAsmFn)(uint32_t width, uint32_t height, uint32_t *dst, uint32_t dstStride, uint32_t *src, uint32_t srcStride, uint32_t halftone, uint32_t halftoneInfo, uint32_t *colourMap, uint32_t bitPtrs, ...); + +#define FAST_PATH(op, src_bpp, dst_bpp, qualifier, halftone_type) \ +extern void armSimd##op##src_bpp##_##dst_bpp##qualifier##_wide (uint32_t width, uint32_t height, uint32_t *dst, uint32_t dstStride, uint32_t *src, uint32_t srcStride, uint32_t halftone, uint32_t halftoneInfo, uint32_t *colourMap, uint32_t bitPtrs, ...); \ +extern void armSimd##op##src_bpp##_##dst_bpp##qualifier##_narrow(uint32_t width, uint32_t height, uint32_t *dst, uint32_t dstStride, uint32_t *src, uint32_t srcStride, uint32_t halftone, uint32_t halftoneInfo, uint32_t *colourMap, uint32_t bitPtrs, ...); \ +extern void armSimd##op##src_bpp##_##dst_bpp##qualifier##_tiny (uint32_t width, uint32_t height, uint32_t *dst, uint32_t dstStride, uint32_t *src, uint32_t srcStride, uint32_t halftone, uint32_t halftoneInfo, uint32_t *colourMap, uint32_t bitPtrs, ...); \ +static void fastPath##op##src_bpp##_##dst_bpp##qualifier(operation_t *op, uint32_t flags) \ +{ \ + IGNORE(flags); \ + /* Copy certain parts of the operation structure to locals to help compiler */ \ + uint32_t *srcBits = op->src.bits; \ + uint32_t srcPitch = op->src.pitch / sizeof (uint32_t); \ + uint32_t srcX = op->src.x; \ + uint32_t srcY = op->src.y; \ + uint32_t *dstBits = op->dest.bits; \ + uint32_t dstPitch = op->dest.pitch / sizeof (uint32_t); \ + uint32_t dstX = op->dest.x; \ + uint32_t dstY = op->dest.y; \ + uint32_t width = op->width; \ + uint32_t height = op->height; \ + uint32_t *cmLookupTable = *op->cmLookupTable; \ + uint32_t halftoneHeight = op->halftoneHeight; \ + uint32_t *halftoneBase = (uint32_t *) *op->halftoneBase; \ + /* Get pointers to initial words */ \ + uint32_t *src = 0; \ + if (src_bpp > 0) \ + src = srcBits + srcPitch * srcY + srcX * src_bpp / 32; \ + uint32_t *dst = dstBits + dstPitch * dstY + dstX * dst_bpp / 32; \ + /* Get initial pixel offset within words, mangle into pitch if possible */ \ + uint32_t bitPtrs = 0; \ + uint32_t srcXpix = 0; \ + if (src_bpp > 0) { \ + srcXpix = srcX & (31 / (src_bpp == 0 ? 1 : src_bpp)); /* ?: to avoid compiler warning on GCC! */ \ + if (src_bpp < 8) \ + bitPtrs = srcXpix << 27; \ + else if (src_bpp == 8 || src_bpp == 16) \ + srcPitch |= srcXpix << 30; \ + } \ + uint32_t dstXpix = dstX & (31/dst_bpp); \ + if (dst_bpp < 8) \ + bitPtrs |= dstXpix; \ + else if (dst_bpp == 8 || dst_bpp == 16) \ + dstPitch |= dstXpix << 30; \ + /* Adjust strides to remove number of words partially or wholly read/written */ \ + if (src_bpp > 0) \ + srcPitch -= (src_bpp * (srcXpix + width) + 31) / 32; \ + dstPitch -= (dst_bpp * (dstXpix + width) + 31) / 32; \ + /* Deal with halftoning */ \ + uint32_t halftone = 0; \ + uint32_t halftoneInfo = 0; \ + if (halftone_type == HALFTONE_SCALAR) \ + halftone = halftoneBase[0]; \ + else if (halftone_type == HALFTONE_VECTOR) { \ + halftone = (uint32_t) (halftoneBase + halftoneHeight); \ + halftoneInfo = (((dstY % halftoneHeight) - halftoneHeight) << 17) | (-halftoneHeight & 0x7FFF); \ + } \ + /* Work out which width class this operation is. \ + * Rather than re-evaluate this for each line, we want one choice \ + * for the whole operation; this means we can't assume anything about \ + * alignment to sizes larger than 4 bytes, because that's the only \ + * guarantee we have about line stride. */ \ + if (width > (128-32)/dst_bpp && (((dstXpix-1) ^ (dstXpix+width-(128-32)/dst_bpp)) &~ (31/dst_bpp))) \ + armSimd##op##src_bpp##_##dst_bpp##qualifier##_wide(width, height, dst, dstPitch, src, srcPitch, halftone, halftoneInfo, cmLookupTable, bitPtrs); \ + else if (dst_bpp > 8 || (((dstXpix-1) ^ (dstXpix+width)) &~ (31/dst_bpp))) \ + armSimd##op##src_bpp##_##dst_bpp##qualifier##_narrow(width, height, dst, dstPitch, src, srcPitch, halftone, halftoneInfo, cmLookupTable, bitPtrs); \ + else \ + armSimd##op##src_bpp##_##dst_bpp##qualifier##_tiny(width, height, dst, dstPitch, src, srcPitch, halftone, halftoneInfo, cmLookupTable, bitPtrs); \ +} + +FAST_PATH(SourceWord,1,32,,HALFTONE_NONE) + +FAST_PATH(SourceWord,1,16,,HALFTONE_NONE) +FAST_PATH(SourceWord,2,32,,HALFTONE_NONE) + +FAST_PATH(SourceWord,1,8,,HALFTONE_NONE) +FAST_PATH(SourceWord,2,16,,HALFTONE_NONE) +FAST_PATH(SourceWord,4,32,,HALFTONE_NONE) + +FAST_PATH(SourceWord,1,4,,HALFTONE_NONE) +FAST_PATH(SourceWord,2,8,,HALFTONE_NONE) +FAST_PATH(SourceWord,4,16,,HALFTONE_NONE) +FAST_PATH(SourceWord,8,32,,HALFTONE_NONE) + +FAST_PATH(SourceWord,1,2,,HALFTONE_NONE) +FAST_PATH(SourceWord,2,4,,HALFTONE_NONE) +FAST_PATH(SourceWord,4,8,,HALFTONE_NONE) +FAST_PATH(SourceWord,8,16,,HALFTONE_NONE) +FAST_PATH(SourceWord,16,32,,HALFTONE_NONE) + +FAST_PATH(SourceWord,1,1,,HALFTONE_NONE) +FAST_PATH(SourceWord,2,2,,HALFTONE_NONE) +FAST_PATH(SourceWord,4,4,,HALFTONE_NONE) +FAST_PATH(SourceWord,8,8,,HALFTONE_NONE) +FAST_PATH(SourceWord,16,16,,HALFTONE_NONE) +FAST_PATH(SourceWord,32,32,,HALFTONE_NONE) + +FAST_PATH(SourceWord,2,1,,HALFTONE_NONE) +FAST_PATH(SourceWord,4,2,,HALFTONE_NONE) +FAST_PATH(SourceWord,8,4,,HALFTONE_NONE) +FAST_PATH(SourceWord,16,8,,HALFTONE_NONE) +FAST_PATH(SourceWord,32,16,,HALFTONE_NONE) + +FAST_PATH(SourceWord,4,1,,HALFTONE_NONE) +FAST_PATH(SourceWord,8,2,,HALFTONE_NONE) +FAST_PATH(SourceWord,16,4,,HALFTONE_NONE) +FAST_PATH(SourceWord,32,8,,HALFTONE_NONE) + +FAST_PATH(SourceWord,8,1,,HALFTONE_NONE) +FAST_PATH(SourceWord,16,2,,HALFTONE_NONE) +FAST_PATH(SourceWord,32,4,,HALFTONE_NONE) + +FAST_PATH(SourceWord,16,1,,HALFTONE_NONE) +FAST_PATH(SourceWord,32,2,,HALFTONE_NONE) + +FAST_PATH(SourceWord,32,1,,HALFTONE_NONE) + +FAST_PATH(SourceWord,0,1,,HALFTONE_NONE) +FAST_PATH(SourceWord,0,1,_scalar,HALFTONE_SCALAR) +FAST_PATH(SourceWord,0,2,,HALFTONE_NONE) +FAST_PATH(SourceWord,0,2,_scalar,HALFTONE_SCALAR) +FAST_PATH(SourceWord,0,4,,HALFTONE_NONE) +FAST_PATH(SourceWord,0,4,_scalar,HALFTONE_SCALAR) +FAST_PATH(SourceWord,0,8,,HALFTONE_NONE) +FAST_PATH(SourceWord,0,8,_scalar,HALFTONE_SCALAR) +FAST_PATH(SourceWord,0,16,,HALFTONE_NONE) +FAST_PATH(SourceWord,0,16,_scalar,HALFTONE_SCALAR) +FAST_PATH(SourceWord,0,32,,HALFTONE_NONE) +FAST_PATH(SourceWord,0,32,_scalar,HALFTONE_SCALAR) + +FAST_PATH(PixPaint,1,1,,HALFTONE_NONE) +FAST_PATH(PixPaint,2,2,,HALFTONE_NONE) +FAST_PATH(PixPaint,4,4,,HALFTONE_NONE) +FAST_PATH(PixPaint,8,8,,HALFTONE_NONE) +FAST_PATH(PixPaint,16,16,,HALFTONE_NONE) +FAST_PATH(PixPaint,32,32,,HALFTONE_NONE) + +FAST_PATH(AlphaBlend,32,32,,HALFTONE_NONE) + +FAST_PATH(BitAnd,1,1,,HALFTONE_NONE) +FAST_PATH(BitAnd,2,2,,HALFTONE_NONE) +FAST_PATH(BitAnd,4,4,,HALFTONE_NONE) +FAST_PATH(BitAnd,8,8,,HALFTONE_NONE) +FAST_PATH(BitAnd,16,16,,HALFTONE_NONE) +FAST_PATH(BitAnd,32,32,,HALFTONE_NONE) + +static fast_path_t fastPaths[] = { + { fastPathSourceWord1_32, CR_sourceWord, STD_FLAGS(1,32,DIRECT,NO) }, + + { fastPathSourceWord1_16, CR_sourceWord, STD_FLAGS(1,16,DIRECT,NO) }, + { fastPathSourceWord2_32, CR_sourceWord, STD_FLAGS(2,32,DIRECT,NO) }, + + { fastPathSourceWord1_8, CR_sourceWord, STD_FLAGS(1,8,DIRECT,NO) }, + { fastPathSourceWord2_16, CR_sourceWord, STD_FLAGS(2,16,DIRECT,NO) }, + { fastPathSourceWord4_32, CR_sourceWord, STD_FLAGS(4,32,DIRECT,NO) }, + + { fastPathSourceWord1_4, CR_sourceWord, STD_FLAGS(1,4,DIRECT,NO) }, + { fastPathSourceWord2_8, CR_sourceWord, STD_FLAGS(2,8,DIRECT,NO) }, + { fastPathSourceWord4_16, CR_sourceWord, STD_FLAGS(4,16,DIRECT,NO) }, + { fastPathSourceWord8_32, CR_sourceWord, STD_FLAGS(8,32,DIRECT,NO) }, + + { fastPathSourceWord1_2, CR_sourceWord, STD_FLAGS(1,2,DIRECT,NO) }, + { fastPathSourceWord2_4, CR_sourceWord, STD_FLAGS(2,4,DIRECT,NO) }, + { fastPathSourceWord4_8, CR_sourceWord, STD_FLAGS(4,8,DIRECT,NO) }, + { fastPathSourceWord8_16, CR_sourceWord, STD_FLAGS(8,16,DIRECT,NO) }, + { fastPathSourceWord16_32, CR_sourceWord, STD_FLAGS(16,32,NO,NO) }, + + { fastPathSourceWord1_1, CR_sourceWord, STD_FLAGS(1,1,NO,NO) }, + { fastPathSourceWord2_2, CR_sourceWord, STD_FLAGS(2,2,NO,NO) }, + { fastPathSourceWord4_4, CR_sourceWord, STD_FLAGS(4,4,NO,NO) }, + { fastPathSourceWord8_8, CR_sourceWord, STD_FLAGS(8,8,NO,NO) }, + { fastPathSourceWord16_16, CR_sourceWord, STD_FLAGS(16,16,NO,NO) }, + { fastPathSourceWord32_32, CR_sourceWord, STD_FLAGS(32,32,NO,NO) }, + + { fastPathSourceWord2_1, CR_sourceWord, STD_FLAGS(2,1,DIRECT,NO) }, + { fastPathSourceWord4_2, CR_sourceWord, STD_FLAGS(4,2,DIRECT,NO) }, + { fastPathSourceWord8_4, CR_sourceWord, STD_FLAGS(8,4,DIRECT,NO) }, + { fastPathSourceWord16_8, CR_sourceWord, STD_FLAGS(16,8,DIRECT,NO) }, + { fastPathSourceWord32_16, CR_sourceWord, STD_FLAGS(32,16,NO,NO) }, + + { fastPathSourceWord4_1, CR_sourceWord, STD_FLAGS(4,1,DIRECT,NO) }, + { fastPathSourceWord8_2, CR_sourceWord, STD_FLAGS(8,2,DIRECT,NO) }, + { fastPathSourceWord16_4, CR_sourceWord, STD_FLAGS(16,4,DIRECT,NO) }, + { fastPathSourceWord32_8, CR_sourceWord, STD_FLAGS(32,8,15BIT,NO) }, + + { fastPathSourceWord8_1, CR_sourceWord, STD_FLAGS(8,1,DIRECT,NO) }, + { fastPathSourceWord16_2, CR_sourceWord, STD_FLAGS(16,2,DIRECT,NO) }, + { fastPathSourceWord32_4, CR_sourceWord, STD_FLAGS(32,4,15BIT,NO) }, + + { fastPathSourceWord16_1, CR_sourceWord, STD_FLAGS(16,1,DIRECT,NO) }, + { fastPathSourceWord32_2, CR_sourceWord, STD_FLAGS(32,2,15BIT,NO) }, + + { fastPathSourceWord32_1, CR_sourceWord, STD_FLAGS(32,1,15BIT,NO) }, + + { fastPathSourceWord0_1, CR_sourceWord, STD_FLAGS_NO_SOURCE(1,NO) }, + { fastPathSourceWord0_1_scalar, CR_sourceWord, STD_FLAGS_NO_SOURCE(1,SCALAR) }, + { fastPathSourceWord0_2, CR_sourceWord, STD_FLAGS_NO_SOURCE(2,NO) }, + { fastPathSourceWord0_2_scalar, CR_sourceWord, STD_FLAGS_NO_SOURCE(2,SCALAR) }, + { fastPathSourceWord0_4, CR_sourceWord, STD_FLAGS_NO_SOURCE(4,NO) }, + { fastPathSourceWord0_4_scalar, CR_sourceWord, STD_FLAGS_NO_SOURCE(4,SCALAR) }, + { fastPathSourceWord0_8, CR_sourceWord, STD_FLAGS_NO_SOURCE(8,NO) }, + { fastPathSourceWord0_8_scalar, CR_sourceWord, STD_FLAGS_NO_SOURCE(8,SCALAR) }, + { fastPathSourceWord0_16, CR_sourceWord, STD_FLAGS_NO_SOURCE(16,NO) }, + { fastPathSourceWord0_16_scalar, CR_sourceWord, STD_FLAGS_NO_SOURCE(16,SCALAR) }, + { fastPathSourceWord0_32, CR_sourceWord, STD_FLAGS_NO_SOURCE(32,NO) }, + { fastPathSourceWord0_32_scalar, CR_sourceWord, STD_FLAGS_NO_SOURCE(32,SCALAR) }, + + { fastPathPixPaint1_1, CR_pixPaint, STD_FLAGS(1,1,NO,NO) }, + { fastPathPixPaint2_2, CR_pixPaint, STD_FLAGS(2,2,NO,NO) }, + { fastPathPixPaint4_4, CR_pixPaint, STD_FLAGS(4,4,NO,NO) }, + { fastPathPixPaint8_8, CR_pixPaint, STD_FLAGS(8,8,NO,NO) }, + { fastPathPixPaint16_16, CR_pixPaint, STD_FLAGS(16,16,NO,NO) }, + { fastPathPixPaint32_32, CR_pixPaint, STD_FLAGS(32,32,NO,NO) }, + + { fastPathAlphaBlend32_32, CR_alphaBlend, STD_FLAGS(32,32,NO,NO) }, + + { fastPathBitAnd1_1, CR_bitAnd, STD_FLAGS(1,1,NO,NO) }, + { fastPathBitAnd2_2, CR_bitAnd, STD_FLAGS(2,2,NO,NO) }, + { fastPathBitAnd4_4, CR_bitAnd, STD_FLAGS(4,4,NO,NO) }, + { fastPathBitAnd8_8, CR_bitAnd, STD_FLAGS(8,8,NO,NO) }, + { fastPathBitAnd16_16, CR_bitAnd, STD_FLAGS(16,16,NO,NO) }, + { fastPathBitAnd32_32, CR_bitAnd, STD_FLAGS(32,32,NO,NO) }, +}; + +void addArmSimdFastPaths(void) +{ + addFastPaths(fastPaths, sizeof fastPaths / sizeof *fastPaths); +} Added: trunk/platforms/Cross/plugins/BitBltPlugin/BitBltArmSimd.h =================================================================== --- trunk/platforms/Cross/plugins/BitBltPlugin/BitBltArmSimd.h (rev 0) +++ trunk/platforms/Cross/plugins/BitBltPlugin/BitBltArmSimd.h 2013-06-18 23:13:50 UTC (rev 2744) @@ -0,0 +1,31 @@ +/* + * Copyright © 2013 Raspberry Pi Foundation + * Copyright © 2013 RISC OS Open Ltd + * + * Permission to use, copy, modify, distribute, and sell this software and its + * documentation for any purpose is hereby granted without fee, provided that + * the above copyright notice appear in all copies and that both that + * copyright notice and this permission notice appear in supporting + * documentation, and that the name of the copyright holders not be used in + * advertising or publicity pertaining to distribution of the software without + * specific, written prior permission. The copyright holders make no + * representations about the suitability of this software for any purpose. It + * is provided "as is" without express or implied warranty. + * + * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS + * SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS, IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY + * SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN + * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING + * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS + * SOFTWARE. + * + */ + +#ifndef BITBLTARMSIMD_H_ +#define BITBLTARMSIMD_H_ + +void addArmSimdFastPaths(void); + +#endif /* BITBLTARMSIMD_H_ */ Added: trunk/platforms/Cross/plugins/BitBltPlugin/BitBltArmSimdAlphaBlend.s =================================================================== --- trunk/platforms/Cross/plugins/BitBltPlugin/BitBltArmSimdAlphaBlend.s (rev 0) +++ trunk/platforms/Cross/plugins/BitBltPlugin/BitBltArmSimdAlphaBlend.s 2013-06-18 23:13:50 UTC (rev 2744) @@ -0,0 +1,141 @@ +; +; Copyright © 2013 Raspberry Pi Foundation +; Copyright © 2013 RISC OS Open Ltd +; +; Permission to use, copy, modify, distribute, and sell this software and its +; documentation for any purpose is hereby granted without fee, provided that +; the above copyright notice appear in all copies and that both that +; copyright notice and this permission notice appear in supporting +; documentation, and that the name of the copyright holders not be used in +; advertising or publicity pertaining to distribution of the software without +; specific, written prior permission. The copyright holders make no +; representations about the suitability of this software for any purpose. It +; is provided "as is" without express or implied warranty. +; +; THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS +; SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND +; FITNESS, IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY +; SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +; WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN +; AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING +; OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS +; SOFTWARE. +; + +; Debug options + GBLL DebugData +;DebugData SETL {TRUE} + GBLL DebugPld +;DebugPld SETL {TRUE} + GBLL VerboseBuild +;VerboseBuild SETL {TRUE} + + GET BitBltArmSimdAsm.hdr + + AREA |BitBltArmSimdAlphaBlend$$Code|, CODE, READONLY + ARM + +; ******************************************************************** + + MACRO + AlphaBlend32_32_init + MOV ht_info, #1 + MOV ht, #0 + ORR ht_info, ht_info, ht_info, LSL #16 ; &10001 + MEND + + MACRO + AlphaBlend32_32_1pixel $src, $dst, $tmp0, $tmp1, $tmp2, $known_not_transp + [ "$known_not_transp" = "" + MOVS $tmp2, $src, LSR #24 ; s_a + BEQ %FT09 ; fully transparent - use dst + ] + TEQ $tmp2, #&FF + BEQ %FT10 ; fully opaque - use src + UXTB $tmp0, $src, ROR #8 ; s_ag + ORR $tmp0, $tmp0, #&FF0000 + UXTB16 $tmp1, $src ; s_rb + MUL $tmp0, $tmp0, $tmp2 + MUL $tmp1, $tmp1, $tmp2 + RSB $tmp2, $tmp2, #&FF + UXTB16 $src, $dst, ROR #8 ; d_ag + UXTB16 $dst, $dst ; d_rb + MLA $src, $src, $tmp2, $tmp0 ; ag + MLA $dst, $dst, $tmp2, $tmp1 ; rb + USUB16 $tmp0, $src, ht_info + UXTAB16 $src, $src, $src, ROR #8 + SEL $tmp1, ht_info, ht + UXTAB16 $src, $tmp1, $src, ROR #8 + USUB16 $tmp0, $dst, ht_info + UXTAB16 $dst, $dst, $dst, ROR #8 + SEL $tmp1, ht_info, ht + UXTAB16 $dst, $tmp1, $dst, ROR #8 + ORR $src, $dst, $src, LSL #8 ; recombine + B %FT10 +09 MOV $src, $dst +10 + MEND + + MACRO + AlphaBlend32_32_32bits $src, $dst, $fixed_skew + Read1Word src, 0, carry, $fixed_skew, skew, scratch + ADD dst, dst, #1*4 + MOVS $wk7, $wk0, LSR #24 + BEQ %FT01 ; all pixels fully transparent - don't touch destination + LDR $wk4, [dst, #-1*4] + AlphaBlend32_32_1pixel $wk0, $wk4, $wk5, $wk6, $wk7, known_not_transp + Write1Word dst, 0 +01 + MEND + + MACRO + AlphaBlend32_32_64bits $src, $fixed_skew + Read2Words src, 0, carry, $fixed_skew, skew, scratch + ADD dst, dst, #2*4 + MOVS $wk7, $wk0, LSR #24 + MOVEQS $wk7, $wk1, LSR #24 + BEQ %FT01 ; all pixels fully transparent - don't touch destination + LDR $wk4, [dst, #-2*4] + AlphaBlend32_32_1pixel $wk0, $wk4, $wk5, $wk6, $wk7 + LDR $wk4, [dst, #-1*4] + AlphaBlend32_32_1pixel $wk1, $wk4, $wk5, $wk6, $wk7 + Write2Words dst, 0 +01 + MEND + + MACRO + AlphaBlend32_32_128bits_head $src, $fixed_skew, $intra_preloads + Read4Words src, 0, carry, $fixed_skew, skew, scratch + MEND + + MACRO + AlphaBlend32_32_128bits_tail $src + ADD dst, dst, #4*4 + MOVS $wk7, $wk0, LSR #24 + MOVEQS $wk7, $wk1, LSR #24 + MOVEQS $wk7, $wk2, LSR #24 + MOVEQS $wk7, $wk3, LSR #24 + BEQ %FT01 ; all pixels fully transparent - don't touch destination + LDR $wk4, [dst, #-4*4] + AlphaBlend32_32_1pixel $wk0, $wk4, $wk5, $wk6, $wk7 + LDR $wk4, [dst, #-3*4] + AlphaBlend32_32_1pixel $wk1, $wk4, $wk5, $wk6, $wk7 + LDR $wk4, [dst, #-2*4] + AlphaBlend32_32_1pixel $wk2, $wk4, $wk5, $wk6, $wk7 + LDR $wk4, [dst, #-1*4] + AlphaBlend32_32_1pixel $wk3, $wk4, $wk5, $wk6, $wk7 + Write4Words dst, 0 +01 + MEND + +;$op GenerateFunctions $src_bpp, $dst_w_bpp, $qualifier, $flags, $prefetch_distance, +; $work_regs, $line_saved_regs, $leading_pixels_reg, $preload_offset_reg, $init, $newline, $cleanup + +AlphaBlend GenerateFunctions 32, 32,, \ + FLAG_DST_READWRITE :OR: FLAG_SPILL_LINE_VARS :OR: FLAG_PROCESS_PARALLEL :OR: FLAG_NO_PRELOAD_DST, 1, \ + "stride_d,stride_s,map,bitptrs,skew,orig_w,scratch,carry", \ + "x,stride_d,stride_s", bitptrs,, init ; leading_pixels_reg = wk3 + +; ******************************************************************** + + END Added: trunk/platforms/Cross/plugins/BitBltPlugin/BitBltArmSimdAsm.hdr =================================================================== --- trunk/platforms/Cross/plugins/BitBltPlugin/BitBltArmSimdAsm.hdr (rev 0) +++ trunk/platforms/Cross/plugins/BitBltPlugin/BitBltArmSimdAsm.hdr 2013-06-18 23:13:50 UTC (rev 2744) @@ -0,0 +1,1939 @@ +; +; Copyright © 2013 Raspberry Pi Foundation +; Copyright © 2013 RISC OS Open Ltd +; +; Permission to use, copy, modify, distribute, and sell this software and its +; documentation for any purpose is hereby granted without fee, provided that +; the above copyright notice appear in all copies and that both that +; copyright notice and this permission notice appear in supporting +; documentation, and that the name of the copyright holders not be used in +; advertising or publicity pertaining to distribution of the software without +; specific, written prior permission. The copyright holders make no +; representations about the suitability of this software for any purpose. It +; is provided "as is" without express or implied warranty. +; +; THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS +; SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND +; FITNESS, IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY +; SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +; WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN +; AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING +; OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS +; SOFTWARE. +; + + [ :LNOT: :DEF: DebugData + GBLL DebugData + ] + [ :LNOT: :DEF: DebugPld + GBLL DebugPld + ] + [ :LNOT: :DEF: VerboseBuild + GBLL VerboseBuild + ] + +; Flag bitfield definitions +FLAG_NO_HALFTONE * 0 :SHL: 0 +FLAG_SCALAR_HALFTONE * 1 :SHL: 0 +FLAG_VECTOR_HALFTONE * 2 :SHL: 0 +FLAG_NO_COLOUR_MAP * 0 :SHL: 2 +FLAG_COLOUR_MAP * 1 :SHL: 2 + +FLAG_DST_WRITEONLY * 0 :SHL: 3 +FLAG_DST_READWRITE * 1 :SHL: 3 +FLAG_SPILL_NO_LINE_VARS * 0 :SHL: 4 +FLAG_SPILL_LINE_VARS_WIDE * 1 :SHL: 4 +FLAG_SPILL_LINE_VARS_NON_WIDE * 2 :SHL: 4 +FLAG_SPILL_LINE_VARS * 3 :SHL: 4 +FLAG_EXPAND_SKEW * 0 :SHL: 6 +FLAG_NO_EXPAND_SKEW * 1 :SHL: 6 +FLAG_PROCESS_SERIAL * 0 :SHL: 7 ; sub-word data is presented MS-aligned, and results are expected LS-aligned +FLAG_PROCESS_PARALLEL * 1 :SHL: 7 ; sub-word data retains its original alignment throughout (only useful if src & dest depths same) +FLAG_MAX_128BIT_MACRO * 0 :SHL: 8 +FLAG_MAX_256BIT_MACRO * 1 :SHL: 8 ; particularly tight loops can sometimes benefit from being unrolled to allow 2x 128-bit blocks to be staggered +FLAG_PRELOAD_DST * 0 :SHL: 9 +FLAG_NO_PRELOAD_DST * 1 :SHL: 9 + +; Offsets into stack + GBLA args_stack_offset +args_stack_offset SETA 9*4 + GBLA locals_stack_offset +locals_stack_offset SETA 0 + +; Top-level macro arguments are held in variables for convenience + GBLA src_bpp + GBLA dst_w_bpp + GBLA flags + GBLA prefetch_distance + GBLS leading_pixels_reg + GBLS preload_offset_reg + GBLS line_saved_regs + GBLS init + GBLS newline + GBLS reinitwk + GBLS cleanup +; Derived values + GBLS prefix + GBLA dst_r_bpp + GBLA src_bpp_shift + GBLA dst_bpp_shift + GBLL sub_byte + GBLA num_line_saved_regs + GBLA pix_per_block + +; Work registers - variables so they can be reassigned between functions +; (should always be assigned in increasing register number though) + GBLA wk0_num + GBLA wk1_num + GBLA wk2_num + GBLA wk3_num + GBLA wk4_num + GBLA wk5_num + GBLA wk6_num + GBLA wk7_num + GBLA wk8_num + GBLA wk9_num + GBLA wk10_num +; String versions of the same + GBLS wk0 + GBLS wk1 + GBLS wk2 + GBLS wk3 + GBLS wk4 + GBLS wk5 + GBLS wk6 + GBLS wk7 + GBLS wk8 + GBLS wk9 + GBLS wk10 + + + [ DebugData :LOR: DebugPld + IMPORT printf + ] + GBLL PrintAtStartOfLine +PrintAtStartOfLine SETL {TRUE} + MACRO + Print$cond $switch, $fmt, $reg0, $reg1, $reg2 + [ Debug$switch + [ "$cond" <> "" :LAND: "$cond" <> "AL" + LCLS opp +opp SETS :REVERSE_CC: "$cond" + B$opp %FT82 + ] + PUSH {r12,r14} + PUSH {r0-r12} + ADD ip, sp, #15*4 + STR ip, [sp, #13*4] + MRS v1, CPSR + [ "$reg0" <> "" + LDR a2, [sp, #:RCONST:$reg0 * 4] + ] + [ "$reg1" <> "" + LDR a3, [sp, #:RCONST:$reg1 * 4] + ] + [ "$reg2" <> "" + LDR a4, [sp, #:RCONST:$reg2 * 4] + ] + ADR a1, %FT80 + ADR lr, %FT81 + B printf +80 + [ PrintAtStartOfLine + = "$switch: " + ] + = "$fmt", 0 +PrintAtStartOfLine SETL "$fmt" :RIGHT: 1 = "\n" + ALIGN +81 MSR CPSR_cxsf, v1 + POP {r0-r12} + ADD sp, sp, #4 + POP {r14} +82 + ] + MEND + + [ :LNOT: :DEF: |objasm$version| :LAND: :LNOT: :DEF: |ads$version| + ; Assume asasm, which is lacking a number of key opcodes + ; Note there's a bug in asasm, the CC_ENCODING value shouldn't need shifting + + MACRO +$label SEL$cond $Rd, $Rn, $Rm +$label DCI :CC_ENCODING:"$cond":SHL:28 :OR: &06800FB0 :OR: (:RCONST:$Rn :SHL: 16) :OR: (:RCONST:$Rd :SHL: 12) :OR: (:RCONST:$Rm :SHL: 0) + MEND + + MACRO +$label UADD8$cond $Rd, $Rn, $Rm +$label DCI :CC_ENCODING:"$cond":SHL:28 :OR: &06500F90 :OR: (:RCONST:$Rn :SHL: 16) :OR: (:RCONST:$Rd :SHL: 12) :OR: (:RCONST:$Rm :SHL: 0) + MEND + + MACRO +$label USUB8$cond $Rd, $Rn, $Rm +$label DCI :CC_ENCODING:"$cond":SHL:28 :OR: &06500FF0 :OR: (:RCONST:$Rn :SHL: 16) :OR: (:RCONST:$Rd :SHL: 12) :OR: (:RCONST:$Rm :SHL: 0) + MEND + + MACRO +$label USUB16$cond $Rd, $Rn, $Rm +$label DCI :CC_ENCODING:"$cond":SHL:28 :OR: &06500F70 :OR: (:RCONST:$Rn :SHL: 16) :OR: (:RCONST:$Rd :SHL: 12) :OR: (:RCONST:$Rm :SHL: 0) + MEND + + MACRO +$label SETEND $endian + IF "$endian" = "LE" +$label DCI &F1010000 + ELIF "$endian" = "BE" +$label DCI &F1010200 + ELSE + ! 1, "Unrecognised SETEND endianness" + ENDIF + MEND + + ] + +; Add a constant, using a minimal number of ARM instructions +; Doesn't handle cases where bit 31 of constant is set, but we're not expecting any of those + MACRO +$lab AddL $dst, $src, $const + LCLA tmp +tmp SETA $const +tmp SETA tmp :OR: (((tmp :AND: &55555555) :SHL: 1) + ((tmp :AND: &AAAAAAAA) :SHR: 1)) + LCLA lsb +lsb SETA tmp :AND::NOT: (tmp-1) +tmp SETA tmp :OR: (tmp :SHR: 2) +tmp SETA tmp :OR: (tmp :SHR: 4) +tmp SETA tmp :OR: (tmp :SHR: 8) +tmp SETA tmp :OR: (tmp :SHR: 16) + LCLA msb +msb SETA (tmp+1) :AND::NOT: tmp + LCLS reg +reg SETS "$src" +$lab + WHILE lsb < msb + ADD $dst, $reg, #($const) :AND: (lsb * &FF) +lsb SETA lsb * 256 +reg SETS "$dst" + WEND + MEND + +; Find log2 of a variable + MACRO +$out Log2 $in + [ $in = 0 +$out SETA -1 + | + LCLA tmp +tmp SETA $in +$out SETA 0 + WHILE tmp > 1 +tmp SETA tmp / 2 +$out SETA $out + 1 + WEND + ] + MEND + +; Find max of two numbers + MACRO +$out Max $a, $b + [ $a > $b +$out SETA $a + | +$out SETA $b + ] + MEND + +; Find if an integer is the last in a group of a power-of-2 integers + MACRO +$result IsEndOfGroup $index, $size + LCLA index +index SETA $index + LCLA size +size SETA $size + [ size < 2 +$result SETL {TRUE} + | +$result SETL (index :AND::NOT: (index + 1)) :AND: (size / 2) > 0 + ] + MEND + +; Convert an integer to a decimal string + MACRO +$str DecimalStr $num + LCLA n +n SETA $num +$str SETS "" + WHILE n <> 0 +$str SETS :CHR:(48 + n % 10) :CC: $str +n SETA n / 10 + WEND + IF :LEN: $str = 0 +$str SETS "0" + ENDIF + MEND + +; Convert a wk register index into the name of the physical register + MACRO +$str LookupWk $index + LCLS wk +wk DecimalStr $index +wk SETS "wk$wk" +$str SETS $wk + MEND + +; Assign the wk registers from a list of registers + MACRO + AssignWk $list + LCLA wk_num + LCLS wk + LCLS tail + LCLS reg +wk_num SETA 0 +tail SETS "$list," + WHILE :LEN: tail > 0 +wk DecimalStr wk_num +wk_num SETA wk_num + 1 +reg SETS "" + WHILE tail :LEFT: 1 <> "," +reg SETS reg :CC: (tail :LEFT: 1) +tail SETS tail :RIGHT: (:LEN:tail - 1) + WEND +tail SETS tail :RIGHT: (:LEN:tail - 1) +wk$wk._num SETA :RCONST: $reg +wk$wk DecimalStr wk$wk._num +wk$wk SETS "r" :CC: wk$wk + WEND + ; Ensure the remaining ones aren't used + WHILE wk_num <= 10 +wk DecimalStr wk_num +wk_num SETA wk_num + 1 +wk$wk._num SETA -1 +wk$wk SETS "invalid_register_wk$wk" + WEND + MEND + +; See if a given register name is in a comma-separated list of registers + MACRO +$out RegIsInList $reg, $list + LCLS tail +tail SETS "$list," + WHILE :LEN: tail > 0 + [ :LEN: "$reg," <= :LEN: tail + [ "$reg," = tail :LEFT: :LEN: "$reg," +$out SETL {TRUE} + MEXIT + ] + ] + WHILE tail :LEFT: 1 <> "," +tail SETS tail :RIGHT: (:LEN:tail - 1) + WEND +tail SETS tail :RIGHT: (:LEN:tail - 1) + WEND +$out SETL {FALSE} + MEND + +; Count how many registers are in a comma-separated list of registers + MACRO +$out CountRegsInList $list +$out SETA 1 + LCLS tail +tail SETS "$list" + WHILE :LEN: tail > 0 + [ tail :LEFT: 1 = "," +$out SETA $out + 1 + ] +tail SETS tail :RIGHT: (:LEN:tail -1) + WEND + MEND + +; Data read macros + + MACRO +$lab ReadFirstSubWord $base, $data, $carry, $pixels, $fixed_skew, $skew, $tmp +$lab + [ src_bpp > 0 :LAND: src_bpp < 32 + LCLS reg0 +reg0 LookupWk $data + IF (flags :AND: FLAG_NO_EXPAND_SKEW) > 0 + [ "$pixels" <> "#0" + AND $tmp, $pixels, #32/src_bpp - 1 + CMP $tmp, $skew, LSR #src_bpp_shift + PrintHI Data, "ReadFirstSubWord: left@%p", $base + LDRHI $reg0, [$base], #4 + PrintHI Data, " %08X\n", $reg0 + ] + CMP $skew, #0 + PrintHI Data, "ReadFirstSubWord: right@%p", $base + LDRHI $carry, [$base], #4 + PrintHI Data, " %08X\n", $carry + CMP $tmp, #0 + BEQ %FT01 + RSB $tmp, $skew, #32 + MOV $reg0, $reg0, LSL $skew + ORR $reg0, $reg0, $carry, LSR $tmp + Print Data, "ReadFirstSubWord: skew %u -> %08X\n", $skew, $reg0 + [ flags :AND: FLAG_PROCESS_PARALLEL = 0 :LAND: "$pixels" <> "#0" + AND $tmp, $pixels, #32/src_bpp - 1 + MOV $tmp, $tmp, LSL #src_bpp_shift + MOV $reg0, $reg0, ROR $tmp + ] +01 + ELIF $fixed_skew == 0 + [ "$pixels" <> "#0" + ANDS $tmp, $pixels, #32/src_bpp - 1 + [ flags :AND: FLAG_PROCESS_PARALLEL = 0 + BEQ %FT01 + Print Data, "ReadFirstSubWord: left@%p", $base + LDR $reg0, [$base], #4 + Print Data, " %08X\n", $reg0 + MOV $tmp, $tmp, LSL #src_bpp_shift + MOV $reg0, $reg0, ROR $tmp +01 + | + PrintNE Data, "ReadFirstSubWord: left@%p", $base + LDRNE $reg0, [$base], #4 + PrintNE Data, " %08X\n", $reg0 + ] + ] + ELSE + [ "$pixels" <> "#0" + AND $tmp, $pixels, #32/src_bpp - 1 + CMP $tmp, #$fixed_skew/src_bpp + PrintHI Data, "ReadFirstSubWord: left@%p", $base + LDRHI $reg0, [$base], #4 + PrintHI Data, " %08X\n", $reg0 + ] + Print Data, "ReadFirstSubWord: right@%p", $base + LDR $carry, [$base], #4 + Print Data, " %08X\n", $carry + CMP $tmp, #0 + BEQ %FT01 + MOV $reg0, $reg0, LSL #$fixed_skew + ORR $reg0, $reg0, $carry, LSR #32-$fixed_skew + Print Data, "ReadFirstSubWord: skew $fixed_skew -> %08X\n", $reg0 + [ flags :AND: FLAG_PROCESS_PARALLEL = 0 + MOV $tmp, $tmp, LSL #src_bpp_shift + MOV $reg0, $reg0, ROR $tmp + ] +01 + ENDIF + ] + MEND + + MACRO +$lab ReadLastSubWord $base, $data, $carry, $pixels, $fixed_skew, $skew, $tmp +$lab + [ src_bpp > 0 :LAND: src_bpp < 32 + LCLS reg0 +reg0 LookupWk $data + IF (flags :AND: FLAG_NO_EXPAND_SKEW) > 0 + CMP $skew, #0 + BHI %FT01 + TST $pixels, #32/src_bpp - 1 + PrintNE Data, "ReadLastSubWord: next@%p", $base + LDRNE $reg0, [$base], #4 + PrintNE Data, " %08X\n", $reg0 + B %FT02 +01 + Print Data, "ReadLastSubWord: left %08X\n", $carry + MOV $reg0, $carry, LSL $skew + AND $tmp, $pixels, #32/src_bpp - 1 + RSB $tmp, $tmp, #32/src_bpp + CMP $tmp, $skew, LSR #src_bpp_shift + BHS %FT02 + Print Data, "ReadLastSubWord: right@%p", $base + LDR $carry, [$base], #4 @@ Diff output truncated at 50000 characters. @@

1 0

VM Maker: VMMaker-tpr.321.mcz
by commits＠source.squeak.org 18 Jun '13

18 Jun '13

tim Rowledge uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker-tpr.321.mcz ==================== Summary ==================== Name: VMMaker-tpr.321 Author: tpr Time: 18 June 2013, 1:58:30.315 pm UUID: f4c1a8a7-e897-437a-8622-645cc63e4382 Ancestors: VMMaker-dtl.320 Add the VMMaker parts to support a new faster BitBLT plugin. In copyBIts we can now branch off to a specialised function that will make use of more tightly code routines for many important BLT rules and cases. For ARM cpu platforms there are also very specialised assembler routines for some cases - but many are in C and suitable for any platform. =============== Diff against VMMaker-dtl.320 =============== Item was changed: ----- Method: BitBltSimulation class>>declareCVarsIn: (in category 'translation') ----- declareCVarsIn: aCCodeGenerator + + "add option of fast path BitBLT code header" + aCCodeGenerator + addHeaderFile:'#ifdef ENABLE_FAST_BLT + #include "BitBltDispatch.h" + #else + // to handle the unavoidable decl in the spec of copyBitsFallback(); + #define operation_t void + #endif'. + aCCodeGenerator var: 'opTable' declareC: 'void *opTable[' , OpTableSize printString , ']'. aCCodeGenerator var: 'maskTable' declareC:'int maskTable[33] = { 0, 1, 3, 0, 15, 31, 0, 0, 255, 0, 0, 0, 0, 0, 0, 0, 65535, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -1 }'. aCCodeGenerator var: 'ditherMatrix4x4' declareC:'const int ditherMatrix4x4[16] = { 0, 8, 2, 10, 12, 4, 14, 6, 3, 11, 1, 9, 15, 7, 13, 5 }'. aCCodeGenerator var: 'ditherThresholds16' declareC:'const int ditherThresholds16[8] = { 0, 2, 4, 6, 8, 12, 14, 16 }'. aCCodeGenerator var: 'ditherValues16' declareC:'const int ditherValues16[32] = { 0, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30 }'. aCCodeGenerator var: 'warpBitShiftTable' declareC:'int warpBitShiftTable[32]'. aCCodeGenerator var:'cmShiftTable' type:'int *'. aCCodeGenerator var:'cmMaskTable' type:'unsigned int *'. aCCodeGenerator var:'cmLookupTable' type:'unsigned int *'. aCCodeGenerator var: 'dither8Lookup' declareC:' unsigned char dither8Lookup[4096]'. aCCodeGenerator var:'ungammaLookupTable' type: 'unsigned char *'. aCCodeGenerator var:'gammaLookupTable' type: 'unsigned char *'. aCCodeGenerator var: 'querySurfaceFn' type: 'void *'. aCCodeGenerator var: 'lockSurfaceFn' type: 'void *'. aCCodeGenerator var: 'unlockSurfaceFn' type: 'void *'! Item was changed: ----- Method: BitBltSimulation class>>requiredMethodNames (in category 'translation') ----- requiredMethodNames + ^(self opTable, #(copyBits:Fallback:)) asSet! - ^self opTable asSet! Item was changed: ----- Method: BitBltSimulation>>copyBits (in category 'setup') ----- copyBits "This function is exported for the Balloon engine" <export: true> <inline: false> self clipRange. (bbW <= 0 or: [bbH <= 0]) ifTrue: ["zero width or height; noop" affectedL := affectedR := affectedT := affectedB := 0. ^ nil]. "Lock the surfaces" self lockSurfaces ifFalse:[^interpreterProxy primitiveFail]. + self isDefined: 'ENABLE_FAST_BLT' + inSmalltalk: [false "there is no current fast path specialisation code in-image"] + comment: '// you really, really mustn''t call this unless you have the rest of the code to link to' + ifTrue:[self copyBitsFastPathSpecialised] + ifFalse: [self copyBitsLockedAndClipped]. - self copyBitsLockedAndClipped. self unlockSurfaces.! Item was added: + ----- Method: BitBltSimulation>>copyBits:Fallback: (in category 'setup') ----- + copyBits: op Fallback: flags + "Recover from the fast path specialised code saying Help-I-cant-cope" + |done | + <static: false> + <returnTypeC: 'void'> + <inline: false> + <var: #op type: 'operation_t *'> + <var: #flags type:'unsigned int'> + self isDefined: #'ENABLE_FAST_BLT' + inSmalltalk: [false] + comment: 'only for fast blt platform specific code' + ifTrue:[ + "recover values from the operation struct used by the fast ARM code" + self cCode:' + combinationRule = op->combinationRule; + noSource = op->noSource; + sourceBits = (sqInt) op->src.bits; + sourcePitch = op->src.pitch; + sourceDepth = op->src.depth; + sourceMSB = op->src.msb; + sx = op->src.x; + sy = op->src.y; + destBits = (sqInt) op->dest.bits; + destPitch = op->dest.pitch; + destDepth = op->dest.depth; + destMSB = op->dest.msb; + dx = op->dest.x; + dy = op->dest.y; + bbW = op->width; + bbH = op->height; + cmFlags = op->cmFlags; + cmShiftTable = (void *) op->cmShiftTable; + cmMaskTable = (void *) op->cmMaskTable; + cmMask = op->cmMask; + cmLookupTable = (void *) op->cmLookupTable; + noHalftone = op->noHalftone; + halftoneHeight = op->halftoneHeight; + halftoneBase = (sqInt) op->halftoneBase; + if (combinationRule == 30 || combinationRule == 31) { + sourceAlpha = op->opt.sourceAlpha; + } + if (combinationRule == 41) { + componentAlphaModeColor = op->opt.componentAlpha.componentAlphaModeColor; + componentAlphaModeAlpha = op->opt.componentAlpha.componentAlphaModeAlpha; + gammaLookupTable = (void *) op->opt.componentAlpha.gammaLookupTable; + ungammaLookupTable = (void *) op->opt.componentAlpha.ungammaLookupTable; + }'. + + destPPW := 32 / destDepth. + cmBitsPerColor := 0. + cmMask = 16r1FF ifTrue: [cmBitsPerColor := 3]. + cmMask = 16rFFF ifTrue: [cmBitsPerColor := 4]. + cmMask = 16r3FFF ifTrue: [cmBitsPerColor := 5]. + + "Try a shortcut for stuff that should be run as quickly as possible" + done := self tryCopyingBitsQuickly. + done ifTrue:[^nil]. + + bitCount := 0. + "Choose and perform the actual copy loop." + self performCopyLoop] + + + + + ! Item was added: + ----- Method: BitBltSimulation>>copyBitsFastPathSpecialised (in category 'setup') ----- + copyBitsFastPathSpecialised + "Perform the actual copyBits operation using the fast path specialised code; fail some cases by falling back to normal code. + Assume: Surfaces have been locked and clipping was performed." + <inline: false> + + self + isDefined: #'ENABLE_FAST_BLT' + inSmalltalk: [false] + comment: 'only for ARM' + ifTrue:[ + "set the affected area to 0 first" + affectedL := affectedR := affectedT := affectedB := 0. + + self copyBitsRule41Test. + (interpreterProxy failed not) + ifFalse: [^ interpreterProxy primitiveFail]. + + "we skip the tryCopyingBitsQuickly and leave that to falback code" + + (combinationRule = 30) | (combinationRule = 31) ifTrue: + ["Check and fetch source alpha parameter for alpha blend" + interpreterProxy methodArgumentCount = 1 + ifTrue: [sourceAlpha := interpreterProxy stackIntegerValue: 0. + (interpreterProxy failed not and: [(sourceAlpha >= 0) & (sourceAlpha <= 255)]) + ifFalse: [^ interpreterProxy primitiveFail]] + ifFalse: [^ interpreterProxy primitiveFail]]. + + "we don't worry about bitCount" + "bitCount := 0." + + "We don't do - Choose and perform the actual copy loop." + "self performCopyLoop." + + "this is done inversely to plain copyBitsLockedAndClipped" + (combinationRule ~= 22) & (combinationRule ~= 32) ifTrue: + ["zero width and height; return the count" + affectedL := dx. + affectedR := dx + bbW. + affectedT := dy. + affectedB := dy + bbH]. + + "Now we fill the 'operation' structure and pass it to the sneaky ARM code" + self cCode:' + // fill the operation structure + operation_t op; + op.combinationRule = combinationRule; + op.noSource = noSource; + op.src.bits = (void *) sourceBits; + op.src.pitch = sourcePitch; + op.src.depth = sourceDepth; + op.src.msb = sourceMSB; + op.src.x = sx; + op.src.y = sy; + op.dest.bits = (void *) destBits; + op.dest.pitch = destPitch; + op.dest.depth = destDepth; + op.dest.msb = destMSB; + op.dest.x = dx; + op.dest.y = dy; + op.width = bbW; + op.height = bbH; + op.cmFlags = cmFlags; + op.cmShiftTable = (void *) cmShiftTable; + op.cmMaskTable = (void *) cmMaskTable; + op.cmMask = cmMask; + op.cmLookupTable = (void *) cmLookupTable; + op.noHalftone = noHalftone; + op.halftoneHeight = halftoneHeight; + op.halftoneBase = (void *) halftoneBase; + if (combinationRule == 30 || combinationRule == 31) { + op.opt.sourceAlpha = sourceAlpha; + } + if (combinationRule == 41) { + op.opt.componentAlpha.componentAlphaModeColor = componentAlphaModeColor; + op.opt.componentAlpha.componentAlphaModeAlpha = componentAlphaModeAlpha; + op.opt.componentAlpha.gammaLookupTable = (void *) gammaLookupTable; + op.opt.componentAlpha.ungammaLookupTable = (void *) ungammaLookupTable; + } + // call the sneaky code + copyBitsDispatch(&op)' + ]! Item was changed: ----- Method: BitBltSimulation>>copyBitsLockedAndClipped (in category 'setup') ----- copyBitsLockedAndClipped "Perform the actual copyBits operation. Assume: Surfaces have been locked and clipping was performed." + | done | + <inline: false> - | done gammaLookupTableOop ungammaLookupTableOop | - <inline: true> - "Try a shortcut for stuff that should be run as quickly as possible" + self copyBitsRule41Test. + (interpreterProxy failed not) + ifFalse: [^ interpreterProxy primitiveFail]. + + "Try a shortcut for stuff that should be run as quickly as possible" + done := self tryCopyingBitsQuickly. - combinationRule = 41 - ifTrue:["fetch the forecolor into componentAlphaModeColor." - componentAlphaModeAlpha := 255. - componentAlphaModeColor := 16777215. - gammaLookupTable := nil. - ungammaLookupTable := nil. - interpreterProxy methodArgumentCount >= 2 - ifTrue:[ - componentAlphaModeAlpha := interpreterProxy stackIntegerValue: (interpreterProxy methodArgumentCount - 2). - (interpreterProxy failed not) - ifFalse: [^ interpreterProxy primitiveFail]. - componentAlphaModeColor := interpreterProxy stackIntegerValue: (interpreterProxy methodArgumentCount - 1). - (interpreterProxy failed not) - ifFalse: [^ interpreterProxy primitiveFail]. - interpreterProxy methodArgumentCount = 4 - ifTrue:[ - gammaLookupTableOop := interpreterProxy stackObjectValue: 1. - (interpreterProxy isBytes: gammaLookupTableOop) - ifTrue:[gammaLookupTable := interpreterProxy firstIndexableField: gammaLookupTableOop.]. - ungammaLookupTableOop := interpreterProxy stackObjectValue: 0. - (interpreterProxy isBytes: ungammaLookupTableOop) - ifTrue:[ungammaLookupTable := interpreterProxy firstIndexableField: ungammaLookupTableOop]]] - ifFalse:[ - interpreterProxy methodArgumentCount = 1 - ifTrue: [ - componentAlphaModeColor := interpreterProxy stackIntegerValue: 0. - (interpreterProxy failed not) - ifFalse: [^ interpreterProxy primitiveFail]] - ifFalse:[^ interpreterProxy primitiveFail]]]. - - done := self tryCopyingBitsQuickly. done ifTrue:[^nil]. (combinationRule = 30) | (combinationRule = 31) ifTrue: ["Check and fetch source alpha parameter for alpha blend" interpreterProxy methodArgumentCount = 1 ifTrue: [sourceAlpha := interpreterProxy stackIntegerValue: 0. (interpreterProxy failed not and: [(sourceAlpha >= 0) & (sourceAlpha <= 255)]) ifFalse: [^ interpreterProxy primitiveFail]] ifFalse: [^ interpreterProxy primitiveFail]]. bitCount := 0. "Choose and perform the actual copy loop." self performCopyLoop. (combinationRule = 22) | (combinationRule = 32) ifTrue: ["zero width and height; return the count" affectedL := affectedR := affectedT := affectedB := 0]. hDir > 0 ifTrue: [affectedL := dx. affectedR := dx + bbW] ifFalse: [affectedL := dx - bbW + 1. affectedR := dx + 1]. vDir > 0 ifTrue: [affectedT := dy. affectedB := dy + bbH] ifFalse: [affectedT := dy - bbH + 1. affectedB := dy + 1]! Item was added: + ----- Method: BitBltSimulation>>copyBitsRule41Test (in category 'setup') ----- + copyBitsRule41Test + "Test possible use of rule 41, rgbComponentAlpha:with: Nothing to return, just set up some variables" + | gammaLookupTableOop ungammaLookupTableOop | + <inline: false> + + combinationRule = 41 + ifTrue:["fetch the forecolor into componentAlphaModeColor." + componentAlphaModeAlpha := 255. + componentAlphaModeColor := 16777215. + gammaLookupTable := nil. + ungammaLookupTable := nil. + interpreterProxy methodArgumentCount >= 2 + ifTrue:[ + componentAlphaModeAlpha := interpreterProxy stackIntegerValue: (interpreterProxy methodArgumentCount - 2). + (interpreterProxy failed not) + ifFalse: [^ interpreterProxy primitiveFail]. + componentAlphaModeColor := interpreterProxy stackIntegerValue: (interpreterProxy methodArgumentCount - 1). + (interpreterProxy failed not) + ifFalse: [^ interpreterProxy primitiveFail]. + interpreterProxy methodArgumentCount = 4 + ifTrue:[ + gammaLookupTableOop := interpreterProxy stackObjectValue: 1. + (interpreterProxy isBytes: gammaLookupTableOop) + ifTrue:[gammaLookupTable := interpreterProxy firstIndexableField: gammaLookupTableOop.]. + ungammaLookupTableOop := interpreterProxy stackObjectValue: 0. + (interpreterProxy isBytes: ungammaLookupTableOop) + ifTrue:[ungammaLookupTable := interpreterProxy firstIndexableField: ungammaLookupTableOop]]] + ifFalse:[ + interpreterProxy methodArgumentCount = 1 + ifTrue: [ + componentAlphaModeColor := interpreterProxy stackIntegerValue: 0. + (interpreterProxy failed not) + ifFalse: [^ interpreterProxy primitiveFail]] + ifFalse:[^ interpreterProxy primitiveFail]]]. + + + ! Item was changed: ----- Method: BitBltSimulation>>initialiseModule (in category 'initialize-release') ----- initialiseModule <export: true> self initBBOpTable. self initDither8Lookup. + self + isDefined: #'ENABLE_FAST_BLT' + inSmalltalk: [false] + comment: 'init the fastpath lists' + ifTrue:[self initialiseCopyBits]. ^true! Item was changed: ----- Method: CCodeGenerator>>emitCHeaderForPrimitivesOn: (in category 'C code generator') ----- emitCHeaderForPrimitivesOn: aStream "Write a C file header for compiled primitives onto the given stream." aStream nextPutAll: '/* Automatically generated from Squeak ('; nextPutAll: VMMaker versionString; nextPutAll: ') on '. Time dateAndTimeNow do: [:e | aStream nextPutAll: e asString; nextPut: Character space]. aStream nextPutAll: '*/'; cr; cr. self fileHeaderVersionStampForSourceClass: vmClass. aStream cr; cr; nextPutAll: '#include "sq.h"'; cr; cr. "Additional header files" + self emitHeaderFilesOn: aStream. - headerFiles do:[:hdr| - aStream nextPutAll:'#include '; nextPutAll: hdr; cr]. aStream nextPutAll: ' #include "sqMemoryAccess.h" /*** Imported Functions/Variables ***/ extern sqInt stackValue(sqInt); extern sqInt stackIntegerValue(sqInt); extern sqInt successFlag; /* allows accessing Strings in both C and Smalltalk */ #define asciiValue(c) c '. aStream cr.! Item was changed: ----- Method: CCodeGenerator>>emitCHeaderOn: (in category 'C code generator') ----- emitCHeaderOn: aStream "Write a C file header onto the given stream." aStream nextPutAll: '/* '. aStream nextPutAll: VMMaker headerNotice. aStream nextPutAll: ' */'; cr; nextPutAll: (self fileHeaderVersionStampForSourceClass: vmClass); cr; cr. self emitGlobalStructFlagOn: aStream. aStream nextPutAll: '#include "sq.h"'; cr. "Additional header files" + self emitHeaderFilesOn: aStream. - headerFiles do:[:hdr| - aStream nextPutAll:'#include '; nextPutAll: hdr; cr]. "Default definitions for optional functions, provided for backward compatibility" self emitDefaultMacrosOn: aStream. aStream nextPutAll: ' #include "sqMemoryAccess.h" sqInt printCallStack(void); void defaultErrorProc(char *s) { /* Print an error message and exit. */ static sqInt printingStack = false; printf("\n%s\n\n", s); if (!!printingStack) { /* flag prevents recursive error when trying to print a broken stack */ printingStack = true; printCallStack(); } exit(-1); } '. aStream cr.! Item was added: + ----- Method: CCodeGenerator>>emitHeaderFilesOn: (in category 'C code generator') ----- + emitHeaderFilesOn: aStream + "Write a header files onto the given stream. A special hack allows use of + #ifdef THING + #include <blah.h> + #endif + constructs" + + "Additional header files" + headerFiles do:[:hdr| + hdr first ~= $# ifTrue: + [aStream nextPutAll: '#include ']. + aStream nextPutAll: hdr; cr]. + ! Item was changed: ----- Method: VMPluginCodeGenerator>>emitCHeaderOn: (in category 'C code generator') ----- emitCHeaderOn: aStream "Write a C file header onto the given stream." aStream nextPutAll: '/* '. aStream nextPutAll: VMMaker headerNotice. aStream nextPutAll: ' */';cr. aStream nextPutAll: (self fileHeaderVersionStampForSourceClass: vmClass). aStream cr; cr. aStream nextPutAll:' #include <math.h> #include <stdio.h> #include <stdlib.h> #include <string.h> #include <time.h> /* Default EXPORT macro that does nothing (see comment in sq.h): */ #define EXPORT(returnType) returnType /* Do not include the entire sq.h file but just those parts needed. */ /* The virtual machine proxy definition */ #include "sqVirtualMachine.h" /* Configuration options */ #include "sqConfig.h" /* Platform specific definitions */ #include "sqPlatformSpecific.h" #define true 1 #define false 0 #define null 0 /* using ''null'' because nil is predefined in Think C */ #ifdef SQUEAK_BUILTIN_PLUGIN #undef EXPORT // was #undef EXPORT(returnType) but screws NorCroft cc #define EXPORT(returnType) static returnType #endif '. "Additional header files" + self emitHeaderFilesOn: aStream. - headerFiles do:[:hdr| - aStream nextPutAll:'#include '; nextPutAll: hdr; cr]. - aStream nextPutAll: ' #include "sqMemoryAccess.h" '. aStream cr.!

1 0

VM Maker: VMMaker-oscog-GuillermoPolito.240.mcz
by commits＠source.squeak.org 18 Jun '13

18 Jun '13

Guillermo Polito uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker-oscog-GuillermoPolito.240.mcz ==================== Summary ==================== Name: VMMaker-oscog-GuillermoPolito.240 Author: GuillermoPolito Time: 17 June 2013, 4:16:37.382 pm UUID: 262dff38-4bb7-450f-afaf-a4ba4c648554 Ancestors: VMMaker-oscog-EstebanLorenzano.239 changing references from FileDirectory to FileSystem =============== Diff against VMMaker-oscog-EstebanLorenzano.239 =============== Item was removed: - SystemOrganization addCategory: #'VMMaker-Building'! - SystemOrganization addCategory: #'VMMaker-JIT'! - SystemOrganization addCategory: #'VMMaker-Interpreter'! - SystemOrganization addCategory: #'VMMaker-InterpreterSimulation'! - SystemOrganization addCategory: #'VMMaker-JITSimulation'! - SystemOrganization addCategory: #'VMMaker-Translation to C'! - SystemOrganization addCategory: #'VMMaker-Support'! - SystemOrganization addCategory: #'VMMaker-PostProcessing'! - SystemOrganization addCategory: #'VMMaker-MemoryManager'! - SystemOrganization addCategory: #'VMMaker-MemoryManagerSimulation'! - SystemOrganization addCategory: #'VMMaker-Multithreading'! - SystemOrganization addCategory: #'VMMaker-Tests'! - SystemOrganization addCategory: #'VMMaker-Plugins'! - SystemOrganization addCategory: #'VMMaker-SmartSyntaxPlugins'! - SystemOrganization addCategory: #'VMMaker-Plugins-Alien'! - SystemOrganization addCategory: #'VMMaker-Plugins-IOS'! Item was added: + SystemOrganization addCategory: #VMMaker! + SystemOrganization addCategory: #'VMMaker-Building'! + SystemOrganization addCategory: #'VMMaker-Interpreter'! + SystemOrganization addCategory: #'VMMaker-InterpreterSimulation'! + SystemOrganization addCategory: #'VMMaker-JIT'! + SystemOrganization addCategory: #'VMMaker-JITSimulation'! + SystemOrganization addCategory: #'VMMaker-MemoryManager'! + SystemOrganization addCategory: #'VMMaker-MemoryManagerSimulation'! + SystemOrganization addCategory: #'VMMaker-Multithreading'! + SystemOrganization addCategory: #'VMMaker-Plugins'! + SystemOrganization addCategory: #'VMMaker-Plugins-Alien'! + SystemOrganization addCategory: #'VMMaker-Plugins-IOS'! + SystemOrganization addCategory: #'VMMaker-PostProcessing'! + SystemOrganization addCategory: #'VMMaker-SmartSyntaxPlugins'! + SystemOrganization addCategory: #'VMMaker-Support'! + SystemOrganization addCategory: #'VMMaker-Tests'! + SystemOrganization addCategory: #'VMMaker-Translation to C'! Item was changed: ----- Method: CCodeGenerator>>extractTypeFor:fromDeclaration: (in category 'utilities') ----- extractTypeFor: aVariable fromDeclaration: aVariableDeclaration "Eliminate inessentials from aVariableDeclaration to answer a C type without the variable, or initializations etc" | decl fpIndex | decl := aVariableDeclaration. (decl beginsWith: 'static') ifTrue: [decl := decl allButFirst: 6]. (decl indexOf: $= ifAbsent: []) ifNotNil: [:index| decl := decl copyFrom: 1 to: index - 1]. decl := decl copyReplaceAll: aVariable with: '' tokenish: [:ch| ch = $_ or: [ch isAlphaNumeric]]. (fpIndex := decl indexOfSubCollection: '(*') > 0 ifTrue: [decl := decl copyReplaceFrom: (decl indexOf: $( startingAt: fpIndex + 1) to: (decl indexOf: $) startingAt: fpIndex + 1) with: '']. + ^decl trimBoth! - ^decl withBlanksTrimmed! Item was changed: ----- Method: CCodeGenerator>>needToGenerateHeader:file:contents: (in category 'C code generator') ----- needToGenerateHeader: headerName file: interpHdrPath contents: newContentsArg "Check if we need to regenerate a header file. We always need to if the contents have changed. But if not we can avoid needless recompilations by not regenerating. So only regenerate if the package is clean (version doesn't include a '*'). If we can't find a package version ask the user." + | newContents oldContents | + interpHdrPath asFileReference exists + ifFalse: [ ^ true ]. - (FileDirectory default fileExists: interpHdrPath) ifFalse: - [^true]. newContents := newContentsArg. + oldContents := (FileStream oldFileNamed: interpHdrPath) contentsOfEntireFile. + (newContents beginsWith: '/*') = (oldContents beginsWith: '/*') + ifFalse: [ + (newContents beginsWith: '/*') + ifTrue: [ + newContents := newContents readStream + upToAll: '*/'; + skipSeparators; + upToEnd ]. + (oldContents beginsWith: '/*') + ifTrue: [ + oldContents := oldContents readStream + upToAll: '*/'; + skipSeparators; + upToEnd ] ]. + oldContents := oldContents + copyReplaceAll: + {(Character cr). + (Character lf)} + with: {(Character cr)}. - oldContents := (FileDirectory default oldFileNamed: interpHdrPath) contentsOfEntireFile. - (newContents beginsWith: '/*') = (oldContents beginsWith: '/*') ifFalse: - [(newContents beginsWith: '/*') ifTrue: - [newContents := newContents readStream upToAll: '*/'; skipSeparators; upToEnd]. - (oldContents beginsWith: '/*') ifTrue: - [oldContents := oldContents readStream upToAll: '*/'; skipSeparators; upToEnd]]. - oldContents := oldContents copyReplaceAll: {Character cr. Character lf} with: {Character cr}. oldContents replaceAll: Character lf with: Character cr. + ^ oldContents ~= newContents + or: [ + [ ((self class monticelloDescriptionFor: vmClass) includes: $*) not ] + on: Error + do: [ :ex | + self + confirm: + headerName + , + ' contents are unchanged.\Writing the file may cause recompilation of support files.\Do you want to write the header file?\The interpreter will still be written either way.' + withCRs ] ]! - ^oldContents ~= newContents - or: [[((self class monticelloDescriptionFor: vmClass) includes: $*) not] - on: Error - do: [:ex| - self confirm: headerName, ' contents are unchanged.\Writing the file may cause recompilation of support files.\Do you want to write the header file?\The interpreter will still be written either way.' withCRs]]! Item was changed: ----- Method: CCodeGenerator>>structClassesForTranslationClasses: (in category 'utilities') ----- structClassesForTranslationClasses: classes "Answer in superclass order (any superclass precedes any subclass) the ancilliaryStructClasses for all the given classes." | structClasses | structClasses := Set new. classes do: [:aTranslationClass| structClasses addAll: ([aTranslationClass ancilliaryStructClasses] on: MessageNotUnderstood do: [:ex| ex message selector == #ancilliaryStructClasses ifTrue: [#()] ifFalse: [ex pass]])]. + ^Class superclassOrder: structClasses asArray! - ^ChangeSet superclassOrder: structClasses asArray! Item was changed: ----- Method: CogVMSimulator>>openAsMorph (in category 'UI') ----- openAsMorph "Open a morphic view on this simulation." | localImageName borderWidth theWindow | + localImageName := FileSystem workingDirectory localNameFor: imageName. - localImageName := FileDirectory default localNameFor: imageName. theWindow := (SystemWindow labelled: 'Simulation of ', localImageName) model: self. theWindow addMorph: (displayView := ImageMorph new image: displayForm) frame: (0@0 corner: 1(a)0.8). transcript := TranscriptStream on: (String new: 10000). theWindow addMorph: (PluggableTextMorph on: transcript text: nil accept: nil readSelection: nil menu: #codePaneMenu:shifted:) frame: (0(a)0.8 corner: 0.7@1). theWindow addMorph: (PluggableTextMorph on: self text: #byteCountText accept: nil readSelection: nil menu: #utilitiesMenu:) hideScrollBarsIndefinitely frame: (0.7(a)0.8 corner: 1@1). borderWidth := [SystemWindow borderWidth] "Squeak 4.1" on: MessageNotUnderstood do: [:ex| 0]. "3.8" borderWidth := borderWidth + theWindow borderWidth. theWindow openInWorldExtent: (self desiredDisplayExtent + (2 * borderWidth) + (0@theWindow labelHeight) * (1(a)(1/0.8))) rounded! Item was changed: ----- Method: CogVMSimulator>>openAsMorphNoTranscript (in category 'UI') ----- openAsMorphNoTranscript "Open a morphic view on this simulation." | localImageName theWindow | + localImageName := FileSystem workingDirectory localNameFor: imageName. - localImageName := FileDirectory default localNameFor: imageName. theWindow := (SystemWindow labelled: 'Simulation of ' , localImageName) model: self. theWindow addMorph: (displayView := ImageMorph new image: displayForm) frame: (0@0 corner: 1(a)0.95). theWindow addMorph: (PluggableTextMorph on: self text: #byteCountText accept: nil readSelection: nil menu: #utilitiesMenu:) hideScrollBarsIndefinitely frame: (0(a)0.95 corner: 1@1). theWindow openInWorldExtent: (self desiredDisplayExtent + (2 * theWindow borderWidth) + (0@theWindow labelHeight) * (1(a)(1/0.95))) rounded! Item was changed: ----- Method: CogVMSimulator>>primitiveDirectoryEntry (in category 'file primitives') ----- primitiveDirectoryEntry | name pathName array result | name := self stringOf: self stackTop. pathName := self stringOf: (self stackValue: 1). self successful ifFalse: [^self primitiveFail]. + array := FileSystem workingDirectory primLookupEntryIn: pathName name: name. - array := FileDirectory default primLookupEntryIn: pathName name: name. array == nil ifTrue: [self pop: 3 thenPush: objectMemory nilObject. ^array]. array == #badDirectoryPath ifTrue: [self halt. ^self primitiveFail]. result := self makeDirEntryName: (array at: 1) size: (array at: 1) size createDate: (array at: 2) modDate: (array at: 3) isDir: (array at: 4) fileSize: (array at: 5) posixPermissions: (array at: 6) isSymlink: (array at: 7). self pop: 3. self push: result! Item was changed: ----- Method: CogVMSimulator>>primitiveDirectoryLookup (in category 'file primitives') ----- primitiveDirectoryLookup | index pathName array result | index := self stackIntegerValue: 0. pathName := (self stringOf: (self stackValue: 1)). self successful ifFalse: [^self primitiveFail]. + array := FileSystem workingDirectory primLookupEntryIn: pathName index: index. - array := FileDirectory default primLookupEntryIn: pathName index: index. array == nil ifTrue: [self pop: 3 thenPush: objectMemory nilObject. ^array]. array == #badDirectoryPath ifTrue: ["self halt." ^self primitiveFail]. result := self makeDirEntryName: (array at: 1) size: (array at: 1) size createDate: (array at: 2) modDate: (array at: 3) isDir: (array at: 4) fileSize: (array at: 5) posixPermissions: (array at: 6) isSymlink: (array at: 7). self pop: 3 thenPush: result! Item was changed: ----- Method: FilePlugin>>asciiDirectoryDelimiter (in category 'directory primitives') ----- asciiDirectoryDelimiter + ^ self cCode: 'dir_Delimitor()' inSmalltalk: [FileSystem disk delimiter asciiValue]! - ^ self cCode: 'dir_Delimitor()' inSmalltalk: [FileDirectory pathNameDelimiter asciiValue]! Item was changed: ----- Method: FilePluginSimulator>>sqFileDeleteName:Size: (in category 'simulation') ----- sqFileDeleteName: nameIndex Size: nameSize | path | path := interpreterProxy interpreter asString: nameIndex size: nameSize. (StandardFileStream isAFileNamed: path) ifFalse: [^interpreterProxy primitiveFail]. + [path asFileReference ensureDeleted] - [FileDirectory deleteFilePath: path] on: Error do: [:ex| interpreterProxy primitiveFail]! Item was changed: ----- Method: FilePluginSimulator>>sqFileRenameOld:Size:New:Size: (in category 'simulation') ----- sqFileRenameOld: oldNameIndex Size: oldNameSize New: newNameIndex Size: newNameSize | oldPath newPath | + oldPath := FileSystem workingDirectory fullNameFor: (interpreterProxy interpreter asString: oldNameIndex size: oldNameSize). + newPath := FileSystem workingDirectory fullNameFor: (interpreterProxy interpreter asString: newNameIndex size: newNameSize). - oldPath := FileDirectory default fullNameFor: (interpreterProxy interpreter asString: oldNameIndex size: oldNameSize). - newPath := FileDirectory default fullNameFor: (interpreterProxy interpreter asString: newNameIndex size: newNameSize). ((StandardFileStream isAFileNamed: oldPath) and: [(StandardFileStream isAFileNamed: newPath) not]) ifFalse: [^interpreterProxy primitiveFail]. + [FileSystem workingDirectory primRename: oldPath to: newPath] - [FileDirectory default primRename: oldPath to: newPath] on: Error do: [:ex| interpreterProxy primitiveFail]! Item was changed: ----- Method: Gnuifier class>>on: (in category 'as yet unclassified') ----- on: aFilePathStringOrDirectory + ^ self new + setDirectory: + (aFilePathStringOrDirectory isString + ifTrue: [ aFilePathStringOrDirectory asFileReference ] + ifFalse: [ aFilePathStringOrDirectory ])! - - ^self new setDirectory: (aFilePathStringOrDirectory isString - ifTrue: [FileDirectory on: aFilePathStringOrDirectory] - ifFalse: [aFilePathStringOrDirectory])! Item was changed: ----- Method: Interpreter class>>macroBenchmark (in category 'benchmarks') ----- macroBenchmark "Interpreter macroBenchmark" "Copied from Interpreter class>>translate:doInlining:forBrowserPlugin:" | cg fileName | fileName := 'benchmark2.out'. Interpreter initialize. ObjectMemory initialize. cg := CCodeGenerator new initialize. Interpreter initialize. ObjectMemory initializeWithOptions: (Dictionary new at: #BytesPerWord put: 4; yourself). cg addClass: Interpreter. cg addClass: ObjectMemory. Interpreter declareCVarsIn: cg. ObjectMemory declareCVarsIn: cg. + FileSystem workingDirectory deleteFileNamed: fileName. - FileDirectory default deleteFileNamed: fileName. cg storeCodeOnFile: fileName doInlining: true. + FileSystem workingDirectory deleteFileNamed: fileName.! - FileDirectory default deleteFileNamed: fileName.! Item was changed: ----- Method: InterpreterPlugin class>>baseDirectoryName (in category 'translation') ----- baseDirectoryName "Return the directory into which plugins should be generated by default." + ^FileSystem workingDirectory pathName! - ^FileDirectory default pathName! Item was changed: ----- Method: InterpreterPlugin class>>translateInDirectory:doInlining: (in category 'translation') ----- translateInDirectory: directory doInlining: inlineFlag "This is the default method for writing out sources for a plugin. Several classes need special handling, so look at all implementors of this message" | cg fname fstat | fname := self moduleName, '.c'. "don't translate if the file is newer than my timeStamp" fstat := directory entryAt: fname ifAbsent:[nil]. fstat ifNotNil: [((self pluginClassesUpTo: self) allSatisfy: + [ :aPluginClass| aPluginClass timeStamp < fstat modificationTime asSeconds ]) ifTrue: - [:aPluginClass| aPluginClass timeStamp < fstat modificationTime]) ifTrue: [^nil]]. self initialize. cg := self buildCodeGeneratorUpTo: self. cg storeCodeOnFile: (directory fullNameFor: fname) doInlining: inlineFlag. ^cg exportedPrimitiveNames asArray! Item was changed: ----- Method: InterpreterSimulator>>openAsMorph (in category 'UI') ----- openAsMorph "Open a morphic view on this simulation." | window localImageName | + localImageName := FileSystem workingDirectory localNameFor: imageName. - localImageName := FileDirectory default localNameFor: imageName. window := (SystemWindow labelled: 'Simulation of ' , localImageName) model: self. window addMorph: (displayView := ImageMorph new image: displayForm) frame: (0@0 corner: 1(a)0.8). transcript := TranscriptStream on: (String new: 10000). window addMorph: (PluggableTextMorph on: transcript text: nil accept: nil readSelection: nil menu: #codePaneMenu:shifted:) frame: (0(a)0.8 corner: 0.7@1). window addMorph: (PluggableTextMorph on: self text: #byteCountText accept: nil) hideScrollBarsIndefinitely frame: (0.7(a)0.8 corner: 1@1). window openInWorld! Item was changed: ----- Method: InterpreterSimulator>>primitiveDirectoryEntry (in category 'file primitives') ----- primitiveDirectoryEntry | name pathName array result | name := self stringOf: self stackTop. pathName := self stringOf: (self stackValue: 1). successFlag ifFalse: [^self primitiveFail]. + array := FileSystem workingDirectory primLookupEntryIn: pathName name: name. - array := FileDirectory default primLookupEntryIn: pathName name: name. array == nil ifTrue: [self pop: 3 thenPush: nilObj. ^array]. array == #badDirectoryPath ifTrue: [self halt. ^self primitiveFail]. result := self makeDirEntryName: (array at: 1) size: (array at: 1) size createDate: (array at: 2) modDate: (array at: 3) isDir: (array at: 4) fileSize: (array at: 5) posixPermissions: (array at: 6) isSymlink: (array at: 7). self pop: 3. self push: result! Item was changed: ----- Method: InterpreterSimulator>>primitiveDirectoryLookup (in category 'file primitives') ----- primitiveDirectoryLookup | index pathName array result | index := self stackIntegerValue: 0. pathName := (self stringOf: (self stackValue: 1)). successFlag ifFalse: [ ^self primitiveFail. ]. + array := FileSystem workingDirectory primLookupEntryIn: pathName index: index. - array := FileDirectory default primLookupEntryIn: pathName index: index. array == nil ifTrue: [ self pop: 3. self push: nilObj. ^array. ]. array == #badDirectoryPath ifTrue: [self halt. ^self primitiveFail. ]. result := self makeDirEntryName: (array at: 1) size: (array at: 1) size createDate: (array at: 2) modDate: (array at: 3) isDir: (array at: 4) fileSize: (array at: 5) posixPermissions: (array at: 6) isSymlink: (array at: 7). self pop: 3. self push: result. ! Item was changed: ----- Method: MiscPrimitivePlugin class>>translateInDirectory:doInlining: (in category 'translation') ----- translateInDirectory: directory doInlining: inlineFlag "handle a special case code string rather than normal generated code." | cg fname fstat | fname := self moduleName, '.c'. "don't translate if the file is newer than my timeStamp" fstat := directory entryAt: fname ifAbsent:[nil]. + fstat ifNotNil:[self timeStamp < fstat modificationTime asSeconds ifTrue:[^nil]]. - fstat ifNotNil:[self timeStamp < fstat modificationTime ifTrue:[^nil]]. self initialize. cg := self buildCodeGeneratorUpTo: InterpreterPlugin. cg addMethodsForPrimitives: self translatedPrimitives. self storeString: cg generateCodeStringForPrimitives onFileNamed: (directory fullNameFor: fname). ^cg exportedPrimitiveNames asArray ! Item was changed: ----- Method: NewspeakInterpreterSimulator>>openAsMorph (in category 'UI') ----- openAsMorph "Open a morphic view on this simulation." | window localImageName | + localImageName := FileSystem workingDirectory localNameFor: imageName. - localImageName := FileDirectory default localNameFor: imageName. window := (SystemWindow labelled: 'Simulation of ', localImageName) model: self. window addMorph: (displayView := ImageMorph new image: displayForm) frame: (0@0 corner: 1(a)0.8). transcript := TranscriptStream on: (String new: 10000). window addMorph: (PluggableTextMorph on: transcript text: nil accept: nil readSelection: nil menu: #codePaneMenu:shifted:) frame: (0(a)0.8 corner: 0.7@1). window addMorph: (PluggableTextMorph on: self text: #byteCountText accept: nil readSelection: nil menu: #utilitiesMenu:) hideScrollBarsIndefinitely frame: (0.7(a)0.8 corner: 1@1). window openInWorldExtent: (self desiredDisplayExtent + (2 * window borderWidth) + (0@window labelHeight) * (1(a)(1/0.8))) rounded! Item was changed: ----- Method: NewspeakInterpreterSimulator>>openAsMorphNoTranscript (in category 'UI') ----- openAsMorphNoTranscript "Open a morphic view on this simulation." | window localImageName | + localImageName := FileSystem workingDirectory localNameFor: imageName. - localImageName := FileDirectory default localNameFor: imageName. window := (SystemWindow labelled: 'Simulation of ' , localImageName) model: self. window addMorph: (displayView := ImageMorph new image: displayForm) frame: (0@0 corner: 1(a)0.95). window addMorph: (PluggableTextMorph on: self text: #byteCountText accept: nil) hideScrollBarsIndefinitely frame: (0(a)0.95 corner: 1@1). window openInWorldExtent: (self desiredDisplayExtent + (2 * window borderWidth) + (0@window labelHeight) * (1(a)(1/0.95))) rounded! Item was changed: ----- Method: NewspeakInterpreterSimulator>>primitiveDirectoryEntry (in category 'file primitives') ----- primitiveDirectoryEntry | name pathName array result | name := self stringOf: self stackTop. pathName := self stringOf: (self stackValue: 1). self successful ifFalse: [^self primitiveFail]. + array := FileSystem workingDirectory primLookupEntryIn: pathName name: name. - array := FileDirectory default primLookupEntryIn: pathName name: name. array == nil ifTrue: [self pop: 3 thenPush: nilObj. ^array]. array == #badDirectoryPath ifTrue: [self halt. ^self primitiveFail]. result := self makeDirEntryName: (array at: 1) size: (array at: 1) size createDate: (array at: 2) modDate: (array at: 3) isDir: (array at: 4) fileSize: (array at: 5) posixPermissions: (array at: 6) isSymlink: (array at: 7). self pop: 3. self push: result! Item was changed: ----- Method: NewspeakInterpreterSimulator>>primitiveDirectoryLookup (in category 'file primitives') ----- primitiveDirectoryLookup | index pathName array result | index := self stackIntegerValue: 0. pathName := (self stringOf: (self stackValue: 1)). self successful ifFalse: [ ^self primitiveFail. ]. + array := FileSystem workingDirectory primLookupEntryIn: pathName index: index. - array := FileDirectory default primLookupEntryIn: pathName index: index. array == nil ifTrue: [ self pop: 3. self push: nilObj. ^array. ]. array == #badDirectoryPath ifTrue: [self halt. ^self primitiveFail. ]. result := self makeDirEntryName: (array at: 1) size: (array at: 1) size createDate: (array at: 2) modDate: (array at: 3) isDir: (array at: 4) fileSize: (array at: 5) posixPermissions: (array at: 6) isSymlink: (array at: 7). self pop: 3. self push: result. ! Item was changed: ----- Method: RiscOSVMMaker class>>generateSqueakStackVM (in category 'configurations') ----- generateSqueakStackVM "RISC OS version; build needed plugins, make sure filename tweaking is used" "RiscOSVMMaker generateSqueakStackVM" ^self generate: StackInterpreter + to: (FileSystem workingDirectory directoryNamed: 'stacksrc') fullName + platformDir: (FileSystem workingDirectory directoryNamed: 'platforms') fullName - to: (FileDirectory default directoryNamed: 'stacksrc') fullName - platformDir: (FileDirectory default directoryNamed: 'platforms') fullName excluding: #(AsynchFilePlugin BrokenPlugin CroquetPlugin FFIPlugin IA32ABIPlugin ImmX11Plugin InternetConfigPlugin JoystickTabletPlugin MIDIPlugin MacMenubarPlugin Mpeg3Plugin NewsqueakIA32ABIPlugin QuicktimePlugin SerialPlugin TestOSAPlugin ThreadedARMFFIPlugin ThreadedFFIPlugin ThreadedIA32FFIPlugin ThreadedPPCBEFFIPlugin UUIDPlugin VMProfileMacSupportPlugin)! Item was changed: ----- Method: StackInterpreter class>>macroBenchmark (in category 'benchmarks') ----- + macroBenchmark + "StackInterpreter macroBenchmark" + - macroBenchmark "StackInterpreter macroBenchmark" | dir | + dir := 'benchmark2.dir' asFileReference. + dir isDirectory + ifTrue: [ dir deleteAllChildren ] + ifFalse: [ dir ensureDirectory ]. + ([ + VMMaker + makerFor: StackInterpreter + and: nil + with: #() + to: dir asFileReference fullName + platformDir: 'none' + excluding: (InterpreterPlugin withAllSubclasses collect: [ :ea | ea name ]) ] + on: VMMakerException + do: [ :ex | ex resume: nil ]) generateInterpreterFile. "suppress bleats about non-existent platforms dir" + dir + deleteAllChildren; + recursiveDelete! - dir := 'benchmark2.dir'. - (FileDirectory default directoryExists: dir) - ifTrue: [(FileDirectory default directoryNamed: dir) recursiveDeleteContents] - ifFalse: [(FileDirectory default directoryNamed: dir) assureExistence]. - ([VMMaker - makerFor: StackInterpreter - and: nil - with: #() - to: (FileDirectory default pathFromURI: dir) - platformDir: 'none' - excluding: (InterpreterPlugin withAllSubclasses collect: [:ea| ea name])] - on: VMMakerException "suppress bleats about non-existent platforms dir" - do: [:ex| ex resume: nil]) - generateInterpreterFile. - (FileDirectory default directoryNamed: dir) recursiveDeleteContents; recursiveDelete! Item was changed: ----- Method: StackInterpreterSimulator>>openAsMorph (in category 'UI') ----- openAsMorph "Open a morphic view on this simulation." | window localImageName | + localImageName := FileSystem workingDirectory localNameFor: imageName. - localImageName := FileDirectory default localNameFor: imageName. window := (SystemWindow labelled: 'Simulation of ', localImageName) model: self. window addMorph: (displayView := ImageMorph new image: displayForm) frame: (0@0 corner: 1(a)0.8). transcript := TranscriptStream on: (String new: 10000). window addMorph: (PluggableTextMorph on: transcript text: nil accept: nil readSelection: nil menu: #codePaneMenu:shifted:) frame: (0(a)0.8 corner: 0.7@1). window addMorph: (PluggableTextMorph on: self text: #byteCountText accept: nil readSelection: nil menu: #utilitiesMenu:) hideScrollBarsIndefinitely frame: (0.7(a)0.8 corner: 1@1). window openInWorldExtent: (self desiredDisplayExtent + (2 * window borderWidth) + (0@window labelHeight) * (1(a)(1/0.8))) rounded! Item was changed: ----- Method: StackInterpreterSimulator>>openAsMorphNoTranscript (in category 'UI') ----- openAsMorphNoTranscript "Open a morphic view on this simulation." | window localImageName | + localImageName := FileSystem workingDirectory localNameFor: imageName. - localImageName := FileDirectory default localNameFor: imageName. window := (SystemWindow labelled: 'Simulation of ' , localImageName) model: self. window addMorph: (displayView := ImageMorph new image: displayForm) frame: (0@0 corner: 1(a)0.95). window addMorph: (PluggableTextMorph on: self text: #byteCountText accept: nil) hideScrollBarsIndefinitely frame: (0(a)0.95 corner: 1@1). window openInWorldExtent: (self desiredDisplayExtent + (2 * window borderWidth) + (0@window labelHeight) * (1(a)(1/0.95))) rounded! Item was changed: ----- Method: StackInterpreterSimulator>>primitiveDirectoryEntry (in category 'file primitives') ----- primitiveDirectoryEntry | name pathName array result | name := self stringOf: self stackTop. pathName := self stringOf: (self stackValue: 1). self successful ifFalse: [^self primitiveFail]. + array := FileSystem workingDirectory primLookupEntryIn: pathName name: name. - array := FileDirectory default primLookupEntryIn: pathName name: name. array == nil ifTrue: [self pop: 3 thenPush: objectMemory nilObject. ^array]. array == #badDirectoryPath ifTrue: [self halt. ^self primitiveFail]. result := self makeDirEntryName: (array at: 1) size: (array at: 1) size createDate: (array at: 2) modDate: (array at: 3) isDir: (array at: 4) fileSize: (array at: 5) posixPermissions: (array at: 6) isSymlink: (array at: 7). self pop: 3. self push: result! Item was changed: ----- Method: StackInterpreterSimulator>>primitiveDirectoryLookup (in category 'file primitives') ----- primitiveDirectoryLookup | index pathName array result | index := self stackIntegerValue: 0. pathName := (self stringOf: (self stackValue: 1)). self successful ifFalse: [^self primitiveFail]. + array := FileSystem workingDirectory primLookupEntryIn: pathName index: index. - array := FileDirectory default primLookupEntryIn: pathName index: index. array == nil ifTrue: [self pop: 3 thenPush: objectMemory nilObject. ^array]. array == #badDirectoryPath ifTrue: ["self halt." ^self primitiveFail]. result := self makeDirEntryName: (array at: 1) size: (array at: 1) size createDate: (array at: 2) modDate: (array at: 3) isDir: (array at: 4) fileSize: (array at: 5) posixPermissions: (array at: 6) isSymlink: (array at: 7). self pop: 3 thenPush: result! Item was changed: ----- Method: TParseNode>>emitCCommentOn:level: (in category 'C code generation') ----- emitCCommentOn: aStream level: level "Emit the transferred Smalltalk comments as C comments." comment ifNotNil: [comment isString ifTrue: [^self]. "safety catch" aStream cr. 1 to: comment size do: [:index | aStream tab: level; nextPutAll: '/* '. ((comment at: index) findTokens: Character cr) + do: [:line| aStream nextPutAll: line trimBoth] - do: [:line| aStream nextPutAll: line withBlanksTrimmed] separatedBy: [aStream crtab: level; next: 3 put: Character space]. aStream nextPutAll: ' */'; cr]. aStream cr]! Item was changed: ----- Method: VMMaker class>>generateNewspeakCogVM (in category 'configurations') ----- generateNewspeakCogVM + ^ VMMaker - ^VMMaker generate: CoInterpreter + and: StackToRegisterMappingCogit + with: #(#NewspeakVM true #MULTIPLEBYTECODESETS true) + to: 'oscogvm/nscogsrc' asFileReference fullName + platformDir: 'oscogvm/platforms' asFileReference fullName + including: + #(#AsynchFilePlugin #BMPReadWriterPlugin #BalloonEnginePlugin #BitBltSimulation #DSAPlugin #DropPlugin #FileCopyPlugin #FilePlugin #FloatArrayPlugin #FloatMathPlugin #InflatePlugin #JPEGReadWriter2Plugin #JPEGReaderPlugin #LargeIntegersPlugin #Matrix2x3Plugin #MiscPrimitivePlugin #NewsqueakIA32ABIPlugin #RePlugin #SecurityPlugin #SocketPlugin #SoundPlugin #SqueakSSLPlugin #SurfacePlugin #ThreadedIA32FFIPlugin #UUIDPlugin #UnixOSProcessPlugin #VMProfileLinuxSupportPlugin #VMProfileMacSupportPlugin #Win32OSProcessPlugin) "Cogit chooseCogitClass"! - and: StackToRegisterMappingCogit"Cogit chooseCogitClass" - with: #( NewspeakVM true - MULTIPLEBYTECODESETS true) - to: (FileDirectory default pathFromURI: 'oscogvm/nscogsrc') - platformDir: (FileDirectory default pathFromURI: 'oscogvm/platforms') - including:#( AsynchFilePlugin BMPReadWriterPlugin BalloonEnginePlugin BitBltSimulation DSAPlugin DropPlugin - FileCopyPlugin FilePlugin FloatArrayPlugin FloatMathPlugin InflatePlugin JPEGReadWriter2Plugin - JPEGReaderPlugin LargeIntegersPlugin Matrix2x3Plugin MiscPrimitivePlugin NewsqueakIA32ABIPlugin - RePlugin SecurityPlugin SocketPlugin SoundPlugin SqueakSSLPlugin SurfacePlugin ThreadedIA32FFIPlugin - UUIDPlugin UnixOSProcessPlugin VMProfileLinuxSupportPlugin VMProfileMacSupportPlugin Win32OSProcessPlugin)! Item was changed: ----- Method: VMMaker class>>generateNewspeakInterpreterVM (in category 'configurations') ----- generateNewspeakInterpreterVM + ^ VMMaker - ^VMMaker generate: NewspeakInterpreter + to: 'oscogvm/nssrc' asFileReference fullName + platformDir: 'oscogvm/platforms' asFileReference fullName + including: + #(#AsynchFilePlugin #BMPReadWriterPlugin #BalloonEnginePlugin #BitBltSimulation #DSAPlugin #DropPlugin #FileCopyPlugin #FilePlugin #FloatArrayPlugin #FloatMathPlugin #InflatePlugin #JPEGReadWriter2Plugin #JPEGReaderPlugin #LargeIntegersPlugin #Matrix2x3Plugin #MiscPrimitivePlugin #NewsqueakIA32ABIPlugin #RePlugin #SecurityPlugin #SocketPlugin #SoundPlugin #SqueakSSLPlugin #SurfacePlugin #UUIDPlugin #UnixOSProcessPlugin #VMProfileLinuxSupportPlugin #VMProfileMacSupportPlugin #Win32OSProcessPlugin)! - to: (FileDirectory default pathFromURI: 'oscogvm/nssrc') - platformDir: (FileDirectory default pathFromURI: 'oscogvm/platforms') - including:#( AsynchFilePlugin BMPReadWriterPlugin BalloonEnginePlugin BitBltSimulation DSAPlugin DropPlugin - FileCopyPlugin FilePlugin FloatArrayPlugin FloatMathPlugin InflatePlugin JPEGReadWriter2Plugin - JPEGReaderPlugin LargeIntegersPlugin Matrix2x3Plugin MiscPrimitivePlugin NewsqueakIA32ABIPlugin - RePlugin SecurityPlugin SocketPlugin SoundPlugin SqueakSSLPlugin SurfacePlugin - UUIDPlugin UnixOSProcessPlugin VMProfileLinuxSupportPlugin VMProfileMacSupportPlugin Win32OSProcessPlugin)! Item was changed: ----- Method: VMMaker class>>generateNewspeakStackVM (in category 'configurations') ----- generateNewspeakStackVM + ^ VMMaker - ^VMMaker generate: StackInterpreter + with: #(#NewspeakVM true #MULTIPLEBYTECODESETS true) + to: 'oscogvm/nsstacksrc' asFileReference fullName + platformDir: 'oscogvm/platforms' asFileReference fullName + including: + #(#AsynchFilePlugin #BMPReadWriterPlugin #BalloonEnginePlugin #BitBltSimulation #DSAPlugin #DropPlugin #FileCopyPlugin #FilePlugin #FloatArrayPlugin #FloatMathPlugin #InflatePlugin #JPEGReadWriter2Plugin #JPEGReaderPlugin #LargeIntegersPlugin #Matrix2x3Plugin #MiscPrimitivePlugin #NewsqueakIA32ABIPlugin #RePlugin #SecurityPlugin #SocketPlugin #SoundPlugin #SurfacePlugin #SqueakSSLPlugin #ThreadedIA32FFIPlugin #UUIDPlugin #UnixOSProcessPlugin #VMProfileLinuxSupportPlugin #VMProfileMacSupportPlugin #Win32OSProcessPlugin)! - with: #(NewspeakVM true MULTIPLEBYTECODESETS true) - to: (FileDirectory default pathFromURI: 'oscogvm/nsstacksrc') - platformDir: (FileDirectory default pathFromURI: 'oscogvm/platforms') - including:#( AsynchFilePlugin BMPReadWriterPlugin BalloonEnginePlugin BitBltSimulation DSAPlugin DropPlugin - FileCopyPlugin FilePlugin FloatArrayPlugin FloatMathPlugin InflatePlugin JPEGReadWriter2Plugin - JPEGReaderPlugin LargeIntegersPlugin Matrix2x3Plugin MiscPrimitivePlugin NewsqueakIA32ABIPlugin - RePlugin SecurityPlugin SocketPlugin SoundPlugin SurfacePlugin SqueakSSLPlugin ThreadedIA32FFIPlugin - UUIDPlugin UnixOSProcessPlugin VMProfileLinuxSupportPlugin VMProfileMacSupportPlugin Win32OSProcessPlugin)! Item was changed: ----- Method: VMMaker class>>generateSqueakCogSistaVM (in category 'configurations') ----- generateSqueakCogSistaVM + ^ VMMaker + generate: + (Smalltalk + at: + ([ :choices | choices at: (UIManager default chooseFrom: choices) ifAbsent: [ ^ self ] ] + value: #(#CoInterpreter #CoInterpreterMT))) - ^VMMaker - generate: (Smalltalk at: ([:choices| choices at: (UIManager default chooseFrom: choices) ifAbsent: [^self]] - value: #(CoInterpreter CoInterpreterMT))) and: SistaStackToRegisterMappingCogit + to: 'oscogvm/sistasrc' asFileReference fullName + platformDir: 'oscogvm/platforms' asFileReference fullName + excluding: (InterpreterPlugin withAllSubclasses collect: [ :ea | ea name ])! - to: (FileDirectory default pathFromURI: 'oscogvm/sistasrc') - platformDir: (FileDirectory default pathFromURI: 'oscogvm/platforms') - excluding: (InterpreterPlugin withAllSubclasses collect: [:ea| ea name])! Item was changed: ----- Method: VMMaker class>>generateSqueakCogVM (in category 'configurations') ----- generateSqueakCogVM + ^ VMMaker + generate: + (Smalltalk + at: + ([ :choices | choices at: (UIManager default chooseFrom: choices) ifAbsent: [ ^ self ] ] + value: #(#CoInterpreter #CoInterpreterMT))) - ^VMMaker - generate: (Smalltalk at: ([:choices| choices at: (UIManager default chooseFrom: choices) ifAbsent: [^self]] - value: #(CoInterpreter CoInterpreterMT))) and: StackToRegisterMappingCogit + with: #(#MULTIPLEBYTECODESETS false #NewspeakVM false) + to: 'oscogvm/src' asFileReference fullName + platformDir: 'oscogvm/platforms' asFileReference fullName + including: + #(#ADPCMCodecPlugin #AsynchFilePlugin #BalloonEnginePlugin #B3DAcceleratorPlugin #BMPReadWriterPlugin #BitBltSimulation #BochsIA32Plugin #CroquetPlugin #DSAPlugin #DeflatePlugin #DropPlugin #FT2Plugin #FFTPlugin #FileCopyPlugin #FilePlugin #FloatArrayPlugin #FloatMathPlugin #GeniePlugin #HostWindowPlugin #IA32ABIPlugin #InternetConfigPlugin #JPEGReadWriter2Plugin #JPEGReaderPlugin #JoystickTabletPlugin #KlattSynthesizerPlugin #LargeIntegersPlugin #LocalePlugin #MIDIPlugin #MacMenubarPlugin #Matrix2x3Plugin #MiscPrimitivePlugin #Mpeg3Plugin #QuicktimePlugin #RePlugin #SecurityPlugin #SerialPlugin #SocketPlugin #SoundCodecPlugin #SoundGenerationPlugin #SoundPlugin #SqueakSSLPlugin #StarSqueakPlugin #ThreadedIA32FFIPlugin #UnixAioPlugin #UUIDPlugin #UnixOSProcessPlugin #Win32OSProcessPlugin #VMProfileLinuxSupportPlugin #VMProfileMacSupportPlugin)! - with: #( MULTIPLEBYTECODESETS false - NewspeakVM false) - to: (FileDirectory default pathFromURI: 'oscogvm/src') - platformDir: (FileDirectory default pathFromURI: 'oscogvm/platforms') - including:#( ADPCMCodecPlugin AsynchFilePlugin BalloonEnginePlugin B3DAcceleratorPlugin - BMPReadWriterPlugin BitBltSimulation BochsIA32Plugin CroquetPlugin DSAPlugin - DeflatePlugin DropPlugin FT2Plugin FFTPlugin FileCopyPlugin FilePlugin FloatArrayPlugin - FloatMathPlugin GeniePlugin HostWindowPlugin IA32ABIPlugin InternetConfigPlugin - JPEGReadWriter2Plugin JPEGReaderPlugin JoystickTabletPlugin KlattSynthesizerPlugin - LargeIntegersPlugin LocalePlugin MIDIPlugin MacMenubarPlugin Matrix2x3Plugin - MiscPrimitivePlugin Mpeg3Plugin QuicktimePlugin RePlugin SecurityPlugin SerialPlugin - SocketPlugin SoundCodecPlugin SoundGenerationPlugin SoundPlugin SqueakSSLPlugin StarSqueakPlugin - ThreadedIA32FFIPlugin UnixAioPlugin UUIDPlugin UnixOSProcessPlugin - Win32OSProcessPlugin VMProfileLinuxSupportPlugin VMProfileMacSupportPlugin)! Item was changed: ----- Method: VMMaker class>>generateSqueakStackVM (in category 'configurations') ----- generateSqueakStackVM "No primitives since we can use those for the Cog VM" ^VMMaker generate: StackInterpreter + to: (FileSystem workingDirectory directoryNamed: 'oscogvm/stacksrc') fullName + platformDir: (FileSystem workingDirectory directoryNamed: 'oscogvm/platforms') fullName - to: (FileDirectory default directoryNamed: 'oscogvm/stacksrc') fullName - platformDir: (FileDirectory default directoryNamed: 'oscogvm/platforms') fullName excluding: (InterpreterPlugin withAllSubclasses collect: [:ea| ea name])! Item was changed: ----- Method: VMMaker class>>machinesDirName (in category 'accessing') ----- machinesDirName + ^DirNames at: #machineType ifAbsent:[Smalltalk os platformName]! - ^DirNames at: #machineType ifAbsent:[SmalltalkImage current platformName]! Item was changed: ----- Method: VMMaker>>buildCodeGeneratorForInterpreter: (in category 'generate sources') ----- buildCodeGeneratorForInterpreter: getAPIMethods "Answer the code generator for translating the interpreter." | cg interpreterClass interpreterClasses structClasses apicg | interpreterClasses := OrderedCollection new. (cg := self createCodeGenerator) vmClass: (interpreterClass := self interpreterClass). [interpreterClass ~~ VMClass] whileTrue: [interpreterClasses addFirst: interpreterClass. interpreterClass := interpreterClass superclass]. cg vmClass objectMemoryClass ifNotNil: [:objectMemoryClass| interpreterClass := objectMemoryClass. [interpreterClass ~~ VMClass] whileTrue: [interpreterClasses addFirst: interpreterClass. interpreterClass := interpreterClass superclass]]. interpreterClasses addFirst: VMClass. interpreterClasses addAllLast: (self interpreterClass ancilliaryClasses copyWithout: cg vmClass objectMemoryClass). structClasses := Set new. interpreterClasses do: [:class| structClasses addAll: class ancilliaryStructClasses]. + (Class superclassOrder: structClasses asArray) do: - (ChangeSet superclassOrder: structClasses asArray) do: [:structClass| structClass initialize. ]. interpreterClasses do: [:ic| (ic respondsTo: #initializeWithOptions:) ifTrue: [ic initializeWithOptions: optionsDictionary] ifFalse: [ic initialize]]. + (Class superclassOrder: structClasses asArray) do: - (ChangeSet superclassOrder: structClasses asArray) do: [:structClass| cg addStructClass: structClass]. interpreterClasses do: [:ic| cg addClass: ic]. (getAPIMethods and: [self interpreterClass needsCogit]) ifTrue: [apicg := self buildCodeGeneratorForCogit: false. cg apiMethods: apicg selectAPIMethods]. ^cg! Item was changed: ----- Method: VMMaker>>configurationInfo (in category 'objects from disk') ----- configurationInfo "build a simple Array of the configuration information that would be usefully saved for later reloading:- the list of internal & external plugins, the flags, the platform name, the two major directory names, bytePerWord two flags indicating whether each directory is relative to the current directory or not. the interpreter class name" | isRelative makeRelative | + isRelative := [:pn| pn beginsWith: FileSystem workingDirectory pathName]. - isRelative := [:pn| pn beginsWith: FileDirectory default pathName]. makeRelative := [:pn| (isRelative value: pn) + ifTrue: [pn allButFirst: FileSystem workingDirectory pathName size + 1] - ifTrue: [pn allButFirst: FileDirectory default pathName size + 1] ifFalse: [pn]]. ^{ internalPlugins asArray. externalPlugins asArray. inline. forBrowser. platformName. makeRelative value: self sourceDirectory pathName. makeRelative value: self platformRootDirectory pathName. self bytesPerWord. isRelative value: self sourceDirectory pathName. isRelative value: self platformRootDirectory pathName. self interpreterClassName }! Item was changed: ----- Method: VMMaker>>copyFileNamed:to: (in category 'private - copying files') ----- copyFileNamed: srcName to: dstName | dstEntry srcEntry | + dstEntry := dstName asFileReference entry. - dstEntry := FileDirectory directoryEntryFor: dstName. dstEntry ifNotNil:[ + srcEntry := srcName asFileReference entry. - srcEntry := FileDirectory directoryEntryFor: srcName. srcEntry ifNil:[^self couldNotOpenFile: srcName]. dstEntry modificationTime >= srcEntry modificationTime ifTrue:[^self]. ]. logger show:'==> ', dstName; cr. ^self primitiveCopyFileNamed: srcName to: dstName ! Item was changed: ----- Method: VMMaker>>generateExportsFile (in category 'exports') ----- generateExportsFile "Store the exports on the given file" | cg contents filePath fileStream | cg := self createCodeGenerator. cg vmClass: self interpreterClass. contents := String streamContents: [:s| s nextPutAll:'/* This is an automatically generated table of all builtin modules in the VM'; cr; next: 3 put: Character space; nextPutAll: (cg shortMonticelloDescriptionForClass: cg vmClass); cr; nextPutAll:' */'; cr. s cr; nextPutAll:'extern sqExport vm_exports[];'. s cr; nextPutAll: 'extern sqExport os_exports[];'. self internalPluginsDo:[:cls| s cr; nextPutAll: 'extern sqExport '; nextPutAll: cls moduleName; nextPutAll:'_exports[];'. ]. s cr. s cr; nextPutAll:'sqExport *pluginExports[] = {'. s crtab; nextPutAll:'vm_exports,'. s crtab; nextPutAll: 'os_exports,'. self internalPluginsDo:[:cls| s crtab; nextPutAll: cls moduleName; nextPutAll:'_exports,' ]. s crtab; nextPutAll:'NULL'. s cr; nextPutAll:'};'; cr]. filePath := self interpreterExportsFilePath. + (cg needToGenerateHeader: filePath asFileReference basename file: filePath contents: contents) ifTrue: - (cg needToGenerateHeader: (FileDirectory baseNameFor: filePath) file: filePath contents: contents) ifTrue: [[fileStream := VMMaker forceNewFileNamed: filePath] on: FileDoesNotExistException do:[^self couldNotOpenFile: filePath]. fileStream nextPutAll: contents; close]! Item was changed: ----- Method: VMMaker>>needsToRegenerateCogitFile (in category 'generate sources') ----- needsToRegenerateCogitFile "check the timestamp for the relevant classes and then the timestamp for the interp.c file if it already exists. Return true if the file needs regenerating, false if not" | cogitClass cogitClasses tStamp fstat | cogitClass := self cogitClass. cogitClasses := cogitClass withAllSuperclasses copyUpThrough: Cogit. cogitClasses addAllLast: cogitClass ancilliaryClasses. tStamp := cogitClasses inject: 0 into: [:tS :cl| tS max: cl timeStamp]. cogitClasses do: [:c| tStamp := c ancilliaryStructClasses inject: tStamp into: [:tS :cl| tS max: cl timeStamp]]. "don't translate if the file is newer than my timeStamp" fstat := self coreVMDirectory entryAt: cogitClass sourceFileName ifAbsent:[nil]. + fstat ifNotNil:[ tStamp < fstat modificationTime asSeconds ifTrue: - fstat ifNotNil:[tStamp < fstat modificationTime ifTrue: [^self confirm: 'The ', cogitClass printString, ' classes have not been modified since\ the source file was last generated.\Do you still want to regenerate it?' withCRs]]. ^true ! Item was changed: ----- Method: VMMaker>>needsToRegenerateInterpreterFile (in category 'initialize') ----- needsToRegenerateInterpreterFile "check the timestamp for the relevant classes and then the timestamp for the interp.c file if it already exists. Return true if the file needs regenerating, false if not" | classes tStamp fstat | classes := self interpreterClass withAllSuperclasses copyUpTo: VMClass. self interpreterClass objectMemoryClass ifNotNil: [:objectMemoryClass| classes addAllLast: (objectMemoryClass withAllSuperclasses copyUpTo: VMClass)]. classes copy do: [:class| classes addAllLast: class ancilliaryClasses]. classes copy do: [:class| classes addAllLast: class ancilliaryStructClasses]. tStamp := classes inject: 0 into: [:tS :cl| tS max: cl timeStamp]. "don't translate if the file is newer than my timeStamp" fstat := self coreVMDirectory entryAt: self interpreterFilename ifAbsent:[nil]. + fstat ifNotNil:[ tStamp < fstat modificationTime asSeconds ifTrue: - fstat ifNotNil:[tStamp < fstat modificationTime ifTrue: [^self confirm: 'The interpreter classes have not been modified since\ the interpreter file was last generated.\Do you still want to regenerate their source file?' withCRs]]. ^true ! Item was changed: ----- Method: VMMaker>>platformRootDirectory (in category 'source directories') ----- platformRootDirectory "return the directory where we should find all platform's sources" + + (platformRootDirName ifNil: [ self class platformsDirName ]) asFileReference isDirectory + ifFalse: [ + "The supposed directory for the platforms code does not - (FileDirectory default - directoryExists: (platformRootDirName - ifNil: [self class platformsDirName])) - ifFalse: ["The supposed directory for the platforms code does not exist." + ^ self couldNotFindDirectory: 'the platform code tree' ]. + ^ FileSystem workingDirectory directoryNamed: (platformRootDirName ifNil: [ self class platformsDirName ])! - ^ self couldNotFindDirectory: 'the platform code tree']. - ^ FileDirectory default - directoryNamed: (platformRootDirName - ifNil: [self class platformsDirName])! Item was changed: ----- Method: VMMaker>>platformRootDirectoryName: (in category 'source directories') ----- platformRootDirectoryName: aString "set the directory where we should find all platform's sources There really ought to be plausible sanity checks done here" + platformRootDirName := aString. + aString asFileReference isDirectory + ifFalse: [ + self couldNotFindDirectory: aString. + ^ false ]. - (FileDirectory default directoryExists: aString) ifFalse:[self couldNotFindDirectory: aString. ^false]. self reinitializePluginsLists. + ^ true! - ^true! Item was changed: ----- Method: VMMaker>>sourceDirectory (in category 'target directories') ----- sourceDirectory | fd | + fd := FileSystem workingDirectory directoryNamed: (sourceDirName - fd := FileDirectory default directoryNamed: (sourceDirName ifNil: [self class sourceDirName, self vmBitnessString]). fd assureExistence. ^ fd! Item was changed: ----- Method: VMMaker>>sourceDirectoryName: (in category 'target directories') ----- sourceDirectoryName: aString "Sanity check really ought to be added, This is the root directory for where the sources will be WRITTEN" + sourceDirName := aString. + aString asFileReference ensureDirectory. - (aString first == $. - ifTrue: [FileDirectory default directoryNamed: aString] - ifFalse: [FileDirectory on: aString]) assureExistence. self changed: #sourceDirectory. + ^ true! - ^true! Item was changed: ----- Method: VMMakerTool>>loadConfig (in category 'configurations') ----- loadConfig | fileResult file | + fileResult := (StandardFileMenu oldFileMenu: FileSystem workingDirectory withPattern: '*.config') - fileResult := (StandardFileMenu oldFileMenu: FileDirectory default withPattern: '*.config') startUpWithCaption: 'Select VMMaker configuration...'. fileResult ifNotNil: [file := fileResult directory fullNameFor: fileResult name. [vmMaker := VMMaker forConfigurationFile: file. vmMaker logger: logger. vmMaker platformDirectory] on: Error do: [self inform: 'Possible problem with path settings or platform name?']. self updateAllViews]! Item was changed: ----- Method: VMMakerTool>>saveConfig (in category 'configurations') ----- saveConfig "write info about the current configuration to a file." | fileResult file | + fileResult := (StandardFileMenu newFileMenu: FileSystem workingDirectory withPattern: '*.config') - fileResult := (StandardFileMenu newFileMenu: FileDirectory default withPattern: '*.config') startUpWithCaption: 'Save VMMaker configuration...'. fileResult ifNotNil: [ ('*.config' match: fileResult name) ifFalse: [fileResult name: (fileResult name, '.config')]. file := fileResult directory fullNameFor: fileResult name. vmMaker saveConfigurationTo: file]. !

1 0

VM Maker: VMMaker-oscog-GuillermoPolito.240.mcz
by commits＠source.squeak.org 18 Jun '13

18 Jun '13

1 0

VM Maker: CMakeVMMaker-GuillermoPolito.206.mcz
by commits＠source.squeak.org 18 Jun '13

18 Jun '13

Guillermo Polito uploaded a new version of CMakeVMMaker to project VM Maker: http://source.squeak.org/VMMaker/CMakeVMMaker-GuillermoPolito.206.mcz ==================== Summary ==================== Name: CMakeVMMaker-GuillermoPolito.206 Author: GuillermoPolito Time: 17 June 2013, 4:20:01.296 pm UUID: ea40c04e-a52a-4637-b881-f52dc86be81d Ancestors: CMakeVMMaker-IgorStasenko.205 changing references from FileDirectory to FileSystem =============== Diff against CMakeVMMaker-IgorStasenko.205 =============== Item was changed: - SystemOrganization addCategory: #'CMakeVMMaker-Android'! SystemOrganization addCategory: #CMakeVMMaker! + SystemOrganization addCategory: #'CMakeVMMaker-Android'! - SystemOrganization addCategory: #'CMakeVMMaker-Unix'! - SystemOrganization addCategory: #'CMakeVMMaker-Windows'! - SystemOrganization addCategory: #'CMakeVMMaker-MacOS'! - SystemOrganization addCategory: #'CMakeVMMaker-IOS'! SystemOrganization addCategory: #'CMakeVMMaker-FreeBSD'! + SystemOrganization addCategory: #'CMakeVMMaker-IOS'! SystemOrganization addCategory: #'CMakeVMMaker-Libs'! + SystemOrganization addCategory: #'CMakeVMMaker-MacOS'! + SystemOrganization addCategory: #'CMakeVMMaker-Unix'! + SystemOrganization addCategory: #'CMakeVMMaker-Windows'! - SystemOrganization addCategory: #'CMakeVMMaker-Chipmunk'! Item was changed: ----- Method: CMakeGenScripts class>>generateCocoaVM (in category 'sources generation') ----- generateCocoaVM | platformDirectoryName | + "B3DAcceleratorPlugin" + "Not using it right now" + platformDirectoryName := (FileSystem workingDirectory parent directoryNamed: 'platforms') fullName. + VMMaker default + platformRootDirectoryName: platformDirectoryName; + sourceDirectoryName: platformDirectoryName , '/iOS/vm/src'; + internal: + #(#ADPCMCodecPlugin #B3DEnginePlugin #BalloonEnginePlugin #BitBltSimulation #BMPReadWriterPlugin #ClipboardExtendedPlugin #DeflatePlugin #DSAPlugin #FFIPlugin #FFTPlugin #FilePlugin #FloatArrayPlugin #GeniePlugin #HostWindowPlugin #JPEGReaderPlugin #JPEGReadWriter2Plugin #KlattSynthesizerPlugin #LargeIntegersPlugin #Matrix2x3Plugin #MacMenubarPlugin #MiscPrimitivePlugin #NewsqueakIA32ABIPlugin #ObjectiveCPlugin #RePlugin #SecurityPlugin #SocketPlugin #SoundCodecPlugin #SoundGenerationPlugin #SoundPlugin #StarSqueakPlugin #SurfacePlugin #UUIDPlugin #DropPlugin) + external: #(#UnixOSProcessPlugin); - - "B3DAcceleratorPlugin" "Not using it right now" - - platformDirectoryName := (FileDirectory default - containingDirectory - directoryNamed: 'platforms') - fullName. - VMMaker default - platformRootDirectoryName: platformDirectoryName; - sourceDirectoryName: platformDirectoryName, '/iOS/vm/src'; - internal: #( - ADPCMCodecPlugin - B3DEnginePlugin - BalloonEnginePlugin - BitBltSimulation - BMPReadWriterPlugin - ClipboardExtendedPlugin - DeflatePlugin - DSAPlugin - FFIPlugin - FFTPlugin - FilePlugin - FloatArrayPlugin - GeniePlugin - HostWindowPlugin - JPEGReaderPlugin - JPEGReadWriter2Plugin - KlattSynthesizerPlugin - LargeIntegersPlugin - Matrix2x3Plugin - MacMenubarPlugin - MiscPrimitivePlugin - NewsqueakIA32ABIPlugin - ObjectiveCPlugin - RePlugin - SecurityPlugin - SocketPlugin - SoundCodecPlugin - SoundGenerationPlugin - SoundPlugin - StarSqueakPlugin - SurfacePlugin - UUIDPlugin - DropPlugin) - external: #( - UnixOSProcessPlugin); generateMainVM; + generateExternalPlugins. "Gnuifier" + (Gnuifier on: (platformDirectoryName , '/iOS/vm/src/vm') asFileReference pathName) gnuify! - generateExternalPlugins. - - "Gnuifier" - (Gnuifier on:((FileDirectory on: platformDirectoryName, '/iOS/vm/src/vm') pathName)) gnuify. - ! Item was changed: ----- Method: CMakeGenScripts class>>generateCogMacOS (in category 'as yet unclassified') ----- generateCogMacOS " generate sources for Stack Interpreter of Mac OS" + | top | + top := FileSystem workingDirectory parent. - top := FileDirectory default containingDirectory. - VMMaker generate: CoInterpreter to: (top / 'src') fullName + platformDir: (top / 'platforms') fullName + excluding: + #(#BrokenPlugin #IA32ABIPluginSimulator #SlangTestPlugin #TestOSAPlugin #FFIPlugin #ReentrantARMFFIPlugin #ReentrantFFIPlugin #ReentrantPPCBEFFIPlugin). + CogMacOSConfig generate! - platformDir: ( top / 'platforms') fullName - excluding:#(BrokenPlugin IA32ABIPluginSimulator SlangTestPlugin TestOSAPlugin - FFIPlugin ReentrantARMFFIPlugin ReentrantFFIPlugin ReentrantPPCBEFFIPlugin). - - CogMacOSConfig generate. - - ! Item was changed: ----- Method: CMakeGenScripts class>>generateCogSources (in category 'sources generation') ----- generateCogSources " self generateCogSources " " generate sources for CoInterpreter" | top | - CogRTLOpcodes initialize. CogIA32Compiler initialize. + top := FileSystem workingDirectory parent. - - top := FileDirectory default containingDirectory. - VMMaker generate: CoInterpreter and: StackToRegisterMappingCogit to: (top / 'src') fullName + platformDir: (top / 'platforms') fullName + excluding: + #(#BrokenPlugin #IA32ABIPluginSimulator #SlangTestPlugin #TestOSAPlugin #FFIPlugin #ReentrantARMFFIPlugin #ReentrantFFIPlugin #ReentrantPPCBEFFIPlugin #NewsqueakIA32ABIPlugin #NewsqueakIA32ABIPluginAttic)! - platformDir: ( top / 'platforms') fullName - excluding:#(BrokenPlugin IA32ABIPluginSimulator SlangTestPlugin TestOSAPlugin - FFIPlugin ReentrantARMFFIPlugin ReentrantFFIPlugin ReentrantPPCBEFFIPlugin NewsqueakIA32ABIPlugin - NewsqueakIA32ABIPluginAttic). - ! Item was changed: ----- Method: CMakeGenScripts class>>generateCogSourcesEmm40 (in category 'sources generation') ----- generateCogSourcesEmm40 " self generateCogSourcesEmm40 " - " generate sources for CoInterpreter" | top | - CogRTLOpcodes initialize. CogIA32Compiler initialize. + top := FileSystem workingDirectory parent. - - top := FileDirectory default containingDirectory. - VMMaker generate: CoInterpreter and: StackToRegisterMappingCogit to: (top / 'src') fullName + platformDir: (top / 'platforms') fullName + excluding: + #(#BrokenPlugin #IA32ABIPluginSimulator #SlangTestPlugin #TestOSAPlugin #FFIPlugin #ReentrantARMFFIPlugin #ReentrantFFIPlugin #ReentrantPPCBEFFIPlugin #NewsqueakIA32ABIPlugin #NewsqueakIA32ABIPluginAttic)! - platformDir: ( top / 'platforms') fullName - excluding:#(BrokenPlugin IA32ABIPluginSimulator SlangTestPlugin TestOSAPlugin - FFIPlugin ReentrantARMFFIPlugin ReentrantFFIPlugin ReentrantPPCBEFFIPlugin NewsqueakIA32ABIPlugin - NewsqueakIA32ABIPluginAttic). - ! Item was changed: ----- Method: CMakeGenScripts class>>generateStackSources (in category 'sources generation') ----- generateStackSources " generate sources for Stack Interpreter of Mac OS" + | top | + top := FileSystem workingDirectory parent. - top := FileDirectory default containingDirectory. - VMMaker generate: StackInterpreter to: (top / 'src') fullName + platformDir: (top / 'platforms') fullName + excluding: + #(#BrokenPlugin #IA32ABIPluginSimulator #SlangTestPlugin #TestOSAPlugin #FFIPlugin #ReentrantARMFFIPlugin #ReentrantFFIPlugin #ReentrantPPCBEFFIPlugin)! - platformDir: ( top / 'platforms') fullName - excluding: #(BrokenPlugin IA32ABIPluginSimulator SlangTestPlugin TestOSAPlugin - FFIPlugin ReentrantARMFFIPlugin ReentrantFFIPlugin ReentrantPPCBEFFIPlugin). - - - - ! Item was changed: ----- Method: CMakeVMGenerator>>topDir (in category 'accessing') ----- topDir | dir | + dir := self config topDir ifNil: [ FileSystem workingDirectory parent ]. + dir isString + ifTrue: [ ^dir asFileReference ]. - dir := self config topDir ifNil: [ FileDirectory default containingDirectory ]. - dir isString ifTrue: [^ FileDirectory on: ( FileDirectory fullPathForURI: dir) ]. ^ dir! Item was changed: ----- Method: CPlatformConfig>>dirFrom: (in category 'utils') ----- dirFrom: aStringOrDir + ^ aStringOrDir isString + ifTrue: [ aStringOrDir asFileReference ] + ifFalse: [ aStringOrDir ]! - - ^ aStringOrDir isString ifTrue: [ - FileDirectory on: ( FileDirectory fullPathForURI: aStringOrDir)] - ifFalse: [ aStringOrDir ]! Item was changed: ----- Method: CPlatformConfig>>topDir (in category 'directories') ----- topDir + ^ topDir ifNil: [ topDir := FileSystem workingDirectory parent ]! - - ^ topDir ifNil: [ topDir := FileDirectory default containingDirectory ]. - ! Item was changed: ----- Method: CPlatformConfig>>topDir: (in category 'directories') ----- topDir: pathString + topDir := pathString asFileReference. + topDir assureExistence! - - topDir := - FileDirectory on: (FileDirectory fullPathForURI: pathString). - topDir assureExistence.! Item was changed: ----- Method: CPlatformConfig>>validateSourcesPresent (in category 'source generation') ----- validateSourcesPresent | sources | + sources := Smalltalk openSources: SmalltalkImage current sourcesName forImage: SmalltalkImage current imageName. - sources := FileDirectory openSources: SmalltalkImage current sourcesName forImage: SmalltalkImage current imageName. ((sources == nil or: [sources atEnd]) and: [ SmalltalkImage current checkSourcesFileAvailability]) ifTrue: [ self error: 'VM source code cannot be generated without .sources file'. ] ! Item was changed: ----- Method: CPlatformConfig>>write:toFile: (in category 'directories') ----- write: aContents toFile: aFileName - "write a file to current output directory (buildDir). use line end convention appropriate for config platform" - | bldDir | - bldDir := self buildDir. + bldDir isString + ifTrue: [ bldDir := bldDir asFileReference ]. - - bldDir isString ifTrue: [ bldDir := FileDirectory on: (FileDirectory fullPathForURI: bldDir) ]. bldDir assureExistence. + bldDir forceNewFileNamed: aFileName do: [ :stream | stream nextPutAll: (self fixLineEndsOf: aContents) ]! - - bldDir forceNewFileNamed: aFileName - do: [:stream | stream nextPutAll: (self fixLineEndsOf: aContents) ].!

1 0

VM Maker: CMakeVMMaker-GuillermoPolito.207.mcz
by commits＠source.squeak.org 18 Jun '13

18 Jun '13

Guillermo Polito uploaded a new version of CMakeVMMaker to project VM Maker: http://source.squeak.org/VMMaker/CMakeVMMaker-GuillermoPolito.207.mcz ==================== Summary ==================== Name: CMakeVMMaker-GuillermoPolito.207 Author: GuillermoPolito Time: 17 June 2013, 6:36:31.366 pm UUID: 83aadf49-80c0-4fa6-bb65-9fbefb18f36a Ancestors: CMakeVMMaker-GuillermoPolito.206 moving to use filesystem =============== Diff against CMakeVMMaker-IgorStasenko.205 =============== Item was changed: - SystemOrganization addCategory: #'CMakeVMMaker-Android'! SystemOrganization addCategory: #CMakeVMMaker! + SystemOrganization addCategory: #'CMakeVMMaker-Android'! - SystemOrganization addCategory: #'CMakeVMMaker-Unix'! - SystemOrganization addCategory: #'CMakeVMMaker-Windows'! - SystemOrganization addCategory: #'CMakeVMMaker-MacOS'! - SystemOrganization addCategory: #'CMakeVMMaker-IOS'! SystemOrganization addCategory: #'CMakeVMMaker-FreeBSD'! + SystemOrganization addCategory: #'CMakeVMMaker-IOS'! SystemOrganization addCategory: #'CMakeVMMaker-Libs'! + SystemOrganization addCategory: #'CMakeVMMaker-MacOS'! + SystemOrganization addCategory: #'CMakeVMMaker-Unix'! + SystemOrganization addCategory: #'CMakeVMMaker-Windows'! - SystemOrganization addCategory: #'CMakeVMMaker-Chipmunk'! Item was changed: ----- Method: CMThirdpartyLibrary>>generateFor: (in category 'generating cmake file') ----- generateFor: aVMGenerator | libDir stream contents | vmGen := aVMGenerator. gen := CMakeGenerator new output: (String new writeStream). + libDir := (aVMGenerator thirdpartyDir / self canonicalName) ensureDirectory. - libDir := (aVMGenerator thirdpartyDir / self canonicalName) assureExistence. stream := String new writeStream. self generate. stream nextPutAll: (vmGen config fixLineEndsOf: gen output contents). contents := stream contents. + (self isFile: (libDir asFileReference / gen outputFileName) fullName hasContents: contents) ifFalse: [ - (self isFile: (libDir fullNameFor: gen outputFileName) hasContents: contents) ifFalse: [ "contents changed, update the file. Because fucking cmake will force rebuild everything if we change its modification date without changing its contents" (libDir forceNewFileNamed: gen outputFileName) nextPutAll: contents; close. ]. vmGen addSubdirectory: vmGen thirdpartyDirName , '/' , self canonicalName. self defineGlobalTargets. ! Item was changed: ----- Method: CMakeGenScripts class>>generateCocoaVM (in category 'sources generation') ----- generateCocoaVM | platformDirectoryName | + "B3DAcceleratorPlugin" + "Not using it right now" + platformDirectoryName := (FileSystem workingDirectory parent / 'platforms') fullName. + VMMaker default + platformRootDirectoryName: platformDirectoryName; + sourceDirectoryName: platformDirectoryName , '/iOS/vm/src'; + internal: + #(#ADPCMCodecPlugin #B3DEnginePlugin #BalloonEnginePlugin #BitBltSimulation #BMPReadWriterPlugin #ClipboardExtendedPlugin #DeflatePlugin #DSAPlugin #FFIPlugin #FFTPlugin #FilePlugin #FloatArrayPlugin #GeniePlugin #HostWindowPlugin #JPEGReaderPlugin #JPEGReadWriter2Plugin #KlattSynthesizerPlugin #LargeIntegersPlugin #Matrix2x3Plugin #MacMenubarPlugin #MiscPrimitivePlugin #NewsqueakIA32ABIPlugin #ObjectiveCPlugin #RePlugin #SecurityPlugin #SocketPlugin #SoundCodecPlugin #SoundGenerationPlugin #SoundPlugin #StarSqueakPlugin #SurfacePlugin #UUIDPlugin #DropPlugin) + external: #(#UnixOSProcessPlugin); - - "B3DAcceleratorPlugin" "Not using it right now" - - platformDirectoryName := (FileDirectory default - containingDirectory - directoryNamed: 'platforms') - fullName. - VMMaker default - platformRootDirectoryName: platformDirectoryName; - sourceDirectoryName: platformDirectoryName, '/iOS/vm/src'; - internal: #( - ADPCMCodecPlugin - B3DEnginePlugin - BalloonEnginePlugin - BitBltSimulation - BMPReadWriterPlugin - ClipboardExtendedPlugin - DeflatePlugin - DSAPlugin - FFIPlugin - FFTPlugin - FilePlugin - FloatArrayPlugin - GeniePlugin - HostWindowPlugin - JPEGReaderPlugin - JPEGReadWriter2Plugin - KlattSynthesizerPlugin - LargeIntegersPlugin - Matrix2x3Plugin - MacMenubarPlugin - MiscPrimitivePlugin - NewsqueakIA32ABIPlugin - ObjectiveCPlugin - RePlugin - SecurityPlugin - SocketPlugin - SoundCodecPlugin - SoundGenerationPlugin - SoundPlugin - StarSqueakPlugin - SurfacePlugin - UUIDPlugin - DropPlugin) - external: #( - UnixOSProcessPlugin); generateMainVM; + generateExternalPlugins. "Gnuifier" + (Gnuifier on: (platformDirectoryName , '/iOS/vm/src/vm') asFileReference pathName) gnuify! - generateExternalPlugins. - - "Gnuifier" - (Gnuifier on:((FileDirectory on: platformDirectoryName, '/iOS/vm/src/vm') pathName)) gnuify. - ! Item was changed: ----- Method: CMakeGenScripts class>>generateCogMacOS (in category 'as yet unclassified') ----- generateCogMacOS " generate sources for Stack Interpreter of Mac OS" + | top | + top := FileSystem workingDirectory parent. - top := FileDirectory default containingDirectory. - VMMaker generate: CoInterpreter to: (top / 'src') fullName + platformDir: (top / 'platforms') fullName + excluding: + #(#BrokenPlugin #IA32ABIPluginSimulator #SlangTestPlugin #TestOSAPlugin #FFIPlugin #ReentrantARMFFIPlugin #ReentrantFFIPlugin #ReentrantPPCBEFFIPlugin). + CogMacOSConfig generate! - platformDir: ( top / 'platforms') fullName - excluding:#(BrokenPlugin IA32ABIPluginSimulator SlangTestPlugin TestOSAPlugin - FFIPlugin ReentrantARMFFIPlugin ReentrantFFIPlugin ReentrantPPCBEFFIPlugin). - - CogMacOSConfig generate. - - ! Item was changed: ----- Method: CMakeGenScripts class>>generateCogSources (in category 'sources generation') ----- generateCogSources " self generateCogSources " " generate sources for CoInterpreter" | top | - CogRTLOpcodes initialize. CogIA32Compiler initialize. + top := FileSystem workingDirectory parent. - - top := FileDirectory default containingDirectory. - VMMaker generate: CoInterpreter and: StackToRegisterMappingCogit to: (top / 'src') fullName + platformDir: (top / 'platforms') fullName + excluding: + #(#BrokenPlugin #IA32ABIPluginSimulator #SlangTestPlugin #TestOSAPlugin #FFIPlugin #ReentrantARMFFIPlugin #ReentrantFFIPlugin #ReentrantPPCBEFFIPlugin #NewsqueakIA32ABIPlugin #NewsqueakIA32ABIPluginAttic)! - platformDir: ( top / 'platforms') fullName - excluding:#(BrokenPlugin IA32ABIPluginSimulator SlangTestPlugin TestOSAPlugin - FFIPlugin ReentrantARMFFIPlugin ReentrantFFIPlugin ReentrantPPCBEFFIPlugin NewsqueakIA32ABIPlugin - NewsqueakIA32ABIPluginAttic). - ! Item was changed: ----- Method: CMakeGenScripts class>>generateCogSourcesEmm40 (in category 'sources generation') ----- generateCogSourcesEmm40 " self generateCogSourcesEmm40 " - " generate sources for CoInterpreter" | top | - CogRTLOpcodes initialize. CogIA32Compiler initialize. + top := FileSystem workingDirectory parent. - - top := FileDirectory default containingDirectory. - VMMaker generate: CoInterpreter and: StackToRegisterMappingCogit to: (top / 'src') fullName + platformDir: (top / 'platforms') fullName + excluding: + #(#BrokenPlugin #IA32ABIPluginSimulator #SlangTestPlugin #TestOSAPlugin #FFIPlugin #ReentrantARMFFIPlugin #ReentrantFFIPlugin #ReentrantPPCBEFFIPlugin #NewsqueakIA32ABIPlugin #NewsqueakIA32ABIPluginAttic)! - platformDir: ( top / 'platforms') fullName - excluding:#(BrokenPlugin IA32ABIPluginSimulator SlangTestPlugin TestOSAPlugin - FFIPlugin ReentrantARMFFIPlugin ReentrantFFIPlugin ReentrantPPCBEFFIPlugin NewsqueakIA32ABIPlugin - NewsqueakIA32ABIPluginAttic). - ! Item was changed: ----- Method: CMakeGenScripts class>>generateStackSources (in category 'sources generation') ----- generateStackSources " generate sources for Stack Interpreter of Mac OS" + | top | + top := FileSystem workingDirectory parent. - top := FileDirectory default containingDirectory. - VMMaker generate: StackInterpreter to: (top / 'src') fullName + platformDir: (top / 'platforms') fullName + excluding: + #(#BrokenPlugin #IA32ABIPluginSimulator #SlangTestPlugin #TestOSAPlugin #FFIPlugin #ReentrantARMFFIPlugin #ReentrantFFIPlugin #ReentrantPPCBEFFIPlugin)! - platformDir: ( top / 'platforms') fullName - excluding: #(BrokenPlugin IA32ABIPluginSimulator SlangTestPlugin TestOSAPlugin - FFIPlugin ReentrantARMFFIPlugin ReentrantFFIPlugin ReentrantPPCBEFFIPlugin). - - - - ! Item was changed: ----- Method: CMakePluginGenerator>>saveFile (in category 'as yet unclassified') ----- saveFile + | reference | + reference := ((vmGen config dirFrom: vmGen buildDir) / plugin moduleName) ensureDirectory; yourself. + (FileStream forceNewFileNamed: (reference / self outputFileName) fullName) + nextPutAll: (self config fixLineEndsOf: output contents); + close.! - (((vmGen config dirFrom: vmGen buildDir) / plugin moduleName) assureExistence forceNewFileNamed: self outputFileName) - nextPutAll: (self config fixLineEndsOf: output contents); close. - ! Item was changed: ----- Method: CMakeVMGenerator>>generateBuildScript (in category 'build script') ----- generateBuildScript + (FileStream forceNewFileNamed: (self buildDir / 'build.sh') fullName) nextPutAll: (config fixLineEndsOf: config buildScript); close. - (self buildDir forceNewFileNamed: 'build.sh') nextPutAll: (config fixLineEndsOf: config buildScript); close. ! Item was changed: ----- Method: CMakeVMGenerator>>generateExportsH: (in category 'as yet unclassified') ----- generateExportsH: libs | content | content := String streamContents: [:str | str nextPutAll: '/* This is automatically generated file using CVMMaker on ', Date current asString, ' ' , Time current asString , ' */'; cr. str nextPutAll: 'extern sqExport vm_exports[]; extern sqExport os_exports[]; '. libs do: [:each | str nextPutAll: 'extern sqExport ', each ,'_exports [];'; cr ]. str cr; nextPutAll: 'sqExport *pluginExports[] = { vm_exports, os_exports, '. libs do: [:each | str nextPutAll: each ,'_exports,'; cr ]. str nextPutAll: 'NULL };' ]. + (FileStream forceNewFileNamed: (self buildDir /'sqNamedPrims.h') fullName) nextPutAll: (config fixLineEndsOf: content); close. - (self buildDir forceNewFileNamed: 'sqNamedPrims.h') nextPutAll: (config fixLineEndsOf: content); close. ! Item was changed: ----- Method: CMakeVMGenerator>>topDir (in category 'accessing') ----- topDir | dir | + dir := self config topDir ifNil: [ FileSystem workingDirectory parent ]. + dir isString + ifTrue: [ ^dir asFileReference ]. - dir := self config topDir ifNil: [ FileDirectory default containingDirectory ]. - dir isString ifTrue: [^ FileDirectory on: ( FileDirectory fullPathForURI: dir) ]. ^ dir! Item was changed: ----- Method: CPlatformConfig>>buildDir (in category 'directories') ----- buildDir + ^ buildDir ifNil: [ buildDir := (self topDir / self buildDirName) ensureDirectory; yourself ]. - ^ buildDir ifNil: [ buildDir := (self topDir / self buildDirName) assureExistence ]. ! Item was changed: ----- Method: CPlatformConfig>>dirFrom: (in category 'utils') ----- dirFrom: aStringOrDir + ^ aStringOrDir isString + ifTrue: [ aStringOrDir asFileReference ] + ifFalse: [ aStringOrDir ]! - - ^ aStringOrDir isString ifTrue: [ - FileDirectory on: ( FileDirectory fullPathForURI: aStringOrDir)] - ifFalse: [ aStringOrDir ]! Item was changed: ----- Method: CPlatformConfig>>setupDirectories: (in category 'directories') ----- setupDirectories: gen | dirsInclude | " write the directories in separate include file" dirsInclude := gen captureOutputDuring: [ gen set: #topDir toString: (self topDir fullName); set: #buildDir toString: (self buildDir ifNil: ['${topDir}/build'] ifNotNil: [self buildDir fullName] ); set: #thirdpartyDir toString: '${buildDir}/thirdParty'; set: #platformsDir toString: self platformsDir; set: #srcDir toString: self srcDir; set: #srcPluginsDir toString: (pluginsDir ifNil: [ '${srcDir}/plugins' ]); set: #srcVMDir toString: '${srcDir}/vm'; set: #platformName toString: self platformName; set: #targetPlatform to: '${platformsDir}/${platformName}'; set: #crossDir toString: '${platformsDir}/Cross'; set: #platformVMDir toString: '${targetPlatform}/vm'; + set: #outputDir toString: self outputDir fullName. - set: #outputDir toString: self outputDir. ]. self write: dirsInclude toFile: 'directories.cmake'. gen include: 'directories.cmake'. ! Item was changed: ----- Method: CPlatformConfig>>topDir (in category 'directories') ----- topDir + ^ topDir ifNil: [ topDir := FileSystem workingDirectory parent ]! - - ^ topDir ifNil: [ topDir := FileDirectory default containingDirectory ]. - ! Item was changed: ----- Method: CPlatformConfig>>topDir: (in category 'directories') ----- topDir: pathString + topDir := pathString asFileReference. + topDir assureExistence! - - topDir := - FileDirectory on: (FileDirectory fullPathForURI: pathString). - topDir assureExistence.! Item was changed: ----- Method: CPlatformConfig>>validateSourcesPresent (in category 'source generation') ----- validateSourcesPresent | sources | + sources := Smalltalk openSources: SmalltalkImage current sourcesName forImage: SmalltalkImage current imageName. - sources := FileDirectory openSources: SmalltalkImage current sourcesName forImage: SmalltalkImage current imageName. ((sources == nil or: [sources atEnd]) and: [ SmalltalkImage current checkSourcesFileAvailability]) ifTrue: [ self error: 'VM source code cannot be generated without .sources file'. ] ! Item was changed: ----- Method: CPlatformConfig>>write:toFile: (in category 'directories') ----- write: aContents toFile: aFileName - "write a file to current output directory (buildDir). use line end convention appropriate for config platform" - | bldDir | - bldDir := self buildDir. + bldDir isString + ifTrue: [ bldDir := bldDir asFileReference ]. + bldDir ensureDirectory. + FileStream + forceNewFileNamed: (bldDir / aFileName) fullName + do: [ :stream | stream nextPutAll: (self fixLineEndsOf: aContents) ]! - - bldDir isString ifTrue: [ bldDir := FileDirectory on: (FileDirectory fullPathForURI: bldDir) ]. - bldDir assureExistence. - - bldDir forceNewFileNamed: aFileName - do: [:stream | stream nextPutAll: (self fixLineEndsOf: aContents) ].! Item was changed: ----- Method: CocoaIOSConfig>>extraPluginSettings: (in category 'plugin extra rules') ----- extraPluginSettings: maker maker set: 'CMAKE_OSX_ARCHITECTURES' to: 'i386'. maker setTargetProperty: 'COMPILE_FLAGS' to: '"-include \"', (self buildDir / self prefixHeaderFileName) fullName, '\""'. maker isExternal ifTrue: [ "copy result to results dir " + maker set: 'LIBRARY_OUTPUT_PATH' toString: self outputDir fullName. + maker set: 'EXECUTABLE_OUTPUT_PATH' toString: self outputDir fullName. - maker set: 'LIBRARY_OUTPUT_PATH' toString: self outputDir. - maker set: 'EXECUTABLE_OUTPUT_PATH' toString: self outputDir. maker puts: 'list(APPEND linkFlags "-undefined dynamic_lookup")' ]. "maker addXCodeProperty: 'GCC_VERSION' value: '4.3'." maker addXCodeProperty: 'GCC_PREFIX_HEADER' value: '${buildDir}/' , self executableName , '_Prefix.pch'. ! Item was changed: ----- Method: CogFamilyCocoaIOSConfig>>setExtraTargetProperties: (in category 'settings') ----- setExtraTargetProperties: maker | plist | maker addFrameworks: self frameworks. " generated and add Info.plist file " plist := self plistFile. + (FileStream forceNewFileNamed: (maker buildDir / 'Info.plist') fullName) - (maker buildDir forceNewFileNamed: 'Info.plist') nextPutAll: plist; close. maker addProperty: 'MACOSX_BUNDLE_INFO_PLIST' value: '${buildDir}/Info.plist'. + (FileStream forceNewFileNamed: (maker buildDir / self prefixHeaderFileName) fullName ) - (maker buildDir forceNewFileNamed: self prefixHeaderFileName) nextPutAll: self precompiledHeaders; close. maker addXCodeProperty: 'GCC_PREFIX_HEADER' value: '${buildDir}/', self prefixHeaderFileName. maker addXCodeProperty: 'PER_ARCH_CFLAGS_i386' value: '-DLSB_FIRST -mfpmath=sse -finline-functions -fno-cse-follow-jumps -fno-gcse -mtune=prescott -march=pentium-m -falign-functions=16'. "maker addXCodeProperty: 'GCC_VERSION' value: '4.3'." maker cmd: 'set_target_properties' params: self executableName, ' PROPERTIES COMPILE_FLAGS "-include \"', (self buildDir / self prefixHeaderFileName) fullName, '\""'. " maker set: 'CMAKE_C_COMPILER' to: '/usr/bin/gcc-4.2'. maker set: 'CMAKE_CXX_COMPILER' to: '/usr/bin/g++-4.2'. " + maker set: 'EXECUTABLE_OUTPUT_PATH' toString: self outputDir fullName. + maker set: 'RUNTIME_OUTPUT_DIRECTORY' toString: self outputDir fullName.! - maker set: 'EXECUTABLE_OUTPUT_PATH' toString: self outputDir. - maker set: 'RUNTIME_OUTPUT_DIRECTORY' toString: self outputDir.! Item was changed: ----- Method: MacOSConfig>>outputDir (in category 'accessing') ----- outputDir "the directory where built binaries will be stored" + ^ outputDir ifNil: [ outputDir := (self buildDir parent / self outputDirName) ] - ^ outputDir ifNil: [ outputDir := (self buildDir containingDirectory fullName , '/', self outputDirName) ] !

1 0

[commit][2743] Cog VM source as per VMMaker.oscog-eem.278.mcz.
by commits＠squeakvm.org 15 Jun '13

15 Jun '13

Revision: 2743 Author: eliot Date: 2013-06-14 16:51:36 -0700 (Fri, 14 Jun 2013) Log Message: ----------- Cog VM source as per VMMaker.oscog-eem.278.mcz. Fix bad performance regression that on certain platforms (linux) results in all send misses causing a discarded PIC creation followed by a slow hash lookup. Modified Paths: -------------- branches/Cog/nscogsrc/vm/cogit.c branches/Cog/nscogsrc/vm/cogit.h branches/Cog/nscogsrc/vm/cogmethod.h branches/Cog/src/vm/cogit.c branches/Cog/src/vm/cogit.h branches/Cog/src/vm/cogmethod.h Property Changed: ---------------- branches/Cog/platforms/Cross/vm/sqSCCSVersion.h Modified: branches/Cog/nscogsrc/vm/cogit.c =================================================================== --- branches/Cog/nscogsrc/vm/cogit.c 2013-06-12 21:59:13 UTC (rev 2742) +++ branches/Cog/nscogsrc/vm/cogit.c 2013-06-14 23:51:36 UTC (rev 2743) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.282 uuid: 6c2f2048-555b-4d37-a9eb-4d9252acf3b9 + CCodeGenerator VMMaker.oscog-eem.299 uuid: e51057f5-4de2-4c2b-82ce-844d130e2f33 from - StackToRegisterMappingCogit VMMaker.oscog-eem.282 uuid: 6c2f2048-555b-4d37-a9eb-4d9252acf3b9 + StackToRegisterMappingCogit VMMaker.oscog-eem.299 uuid: e51057f5-4de2-4c2b-82ce-844d130e2f33 */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.282 uuid: 6c2f2048-555b-4d37-a9eb-4d9252acf3b9 " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.299 uuid: e51057f5-4de2-4c2b-82ce-844d130e2f33 " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -2827,7 +2827,7 @@ /* otherwise attempt to create a closed PIC for the two cases. */ pic = cogPICSelectornumArgsCase0MethodCase1MethodtagisMNUCase((targetMethod->selector), (targetMethod->cmNumArgs), targetMethod, newTargetMethodOrNil, cacheTag, errorSelectorOrNil == SelectorDoesNotUnderstand); - if ((((sqInt)pic)) < 0) { + if ((((((sqInt)pic)) >= MaxNegativeErrorCode) && ((((sqInt)pic)) <= -1))) { /* For some reason the PIC couldn't be generated, most likely a lack of code memory. Continue as if this is an unlinked send. */ Modified: branches/Cog/nscogsrc/vm/cogit.h =================================================================== --- branches/Cog/nscogsrc/vm/cogit.h 2013-06-12 21:59:13 UTC (rev 2742) +++ branches/Cog/nscogsrc/vm/cogit.h 2013-06-14 23:51:36 UTC (rev 2743) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.282 uuid: 6c2f2048-555b-4d37-a9eb-4d9252acf3b9 + CCodeGenerator VMMaker.oscog-eem.299 uuid: e51057f5-4de2-4c2b-82ce-844d130e2f33 */ Modified: branches/Cog/nscogsrc/vm/cogmethod.h =================================================================== --- branches/Cog/nscogsrc/vm/cogmethod.h 2013-06-12 21:59:13 UTC (rev 2742) +++ branches/Cog/nscogsrc/vm/cogmethod.h 2013-06-14 23:51:36 UTC (rev 2743) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.282 uuid: 6c2f2048-555b-4d37-a9eb-4d9252acf3b9 + CCodeGenerator VMMaker.oscog-eem.299 uuid: e51057f5-4de2-4c2b-82ce-844d130e2f33 */ typedef struct { Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h ___________________________________________________________________ Modified: checkindate - Wed Jun 12 12:39:49 PDT 2013 + Fri Jun 14 16:49:42 PDT 2013 Modified: branches/Cog/src/vm/cogit.c =================================================================== --- branches/Cog/src/vm/cogit.c 2013-06-12 21:59:13 UTC (rev 2742) +++ branches/Cog/src/vm/cogit.c 2013-06-14 23:51:36 UTC (rev 2743) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.282 uuid: 6c2f2048-555b-4d37-a9eb-4d9252acf3b9 + CCodeGenerator VMMaker.oscog-eem.299 uuid: e51057f5-4de2-4c2b-82ce-844d130e2f33 from - StackToRegisterMappingCogit VMMaker.oscog-eem.282 uuid: 6c2f2048-555b-4d37-a9eb-4d9252acf3b9 + StackToRegisterMappingCogit VMMaker.oscog-eem.299 uuid: e51057f5-4de2-4c2b-82ce-844d130e2f33 */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.282 uuid: 6c2f2048-555b-4d37-a9eb-4d9252acf3b9 " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.299 uuid: e51057f5-4de2-4c2b-82ce-844d130e2f33 " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -2433,7 +2433,7 @@ /* otherwise attempt to create a closed PIC for the two cases. */ pic = cogPICSelectornumArgsCase0MethodCase1MethodtagisMNUCase((targetMethod->selector), (targetMethod->cmNumArgs), targetMethod, newTargetMethodOrNil, cacheTag, errorSelectorOrNil == SelectorDoesNotUnderstand); - if ((((sqInt)pic)) < 0) { + if ((((((sqInt)pic)) >= MaxNegativeErrorCode) && ((((sqInt)pic)) <= -1))) { /* For some reason the PIC couldn't be generated, most likely a lack of code memory. Continue as if this is an unlinked send. */ Modified: branches/Cog/src/vm/cogit.h =================================================================== --- branches/Cog/src/vm/cogit.h 2013-06-12 21:59:13 UTC (rev 2742) +++ branches/Cog/src/vm/cogit.h 2013-06-14 23:51:36 UTC (rev 2743) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.282 uuid: 6c2f2048-555b-4d37-a9eb-4d9252acf3b9 + CCodeGenerator VMMaker.oscog-eem.299 uuid: e51057f5-4de2-4c2b-82ce-844d130e2f33 */ Modified: branches/Cog/src/vm/cogmethod.h =================================================================== --- branches/Cog/src/vm/cogmethod.h 2013-06-12 21:59:13 UTC (rev 2742) +++ branches/Cog/src/vm/cogmethod.h 2013-06-14 23:51:36 UTC (rev 2743) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.282 uuid: 6c2f2048-555b-4d37-a9eb-4d9252acf3b9 + CCodeGenerator VMMaker.oscog-eem.299 uuid: e51057f5-4de2-4c2b-82ce-844d130e2f33 */ typedef struct {

1 0

VM Maker: VMMaker.oscog-eem.299.mcz
by commits＠source.squeak.org 15 Jun '13

15 Jun '13

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.299.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.299 Author: eem Time: 14 June 2013, 4:47:32.815 pm UUID: e51057f5-4de2-4c2b-82ce-844d130e2f33 Ancestors: VMMaker.oscog-eem.298 Fix bad performance regression that on certain platforms (linux) results in all send misses causing a discarded PIC creation followed by a slow hash lookup. =============== Diff against VMMaker.oscog-eem.298 =============== Item was changed: ----- Method: Cogit>>ceSICMiss: (in category 'in-line cacheing') ----- ceSICMiss: receiver "An in-line cache check in a method has failed. The failing entry check has jumped to the ceMethodAbort abort call at the start of the method which has called this routine. If possible allocate a closed PIC for the current and existing classes. The stack looks like: receiver args sender return address sp=> ceMethodAbort call return address So we can find the method that did the failing entry check at ceMethodAbort call return address - missOffset and we can find the send site from the outer return address." <api> | pic innerReturn outerReturn entryPoint targetMethod newTargetMethodOrNil errorSelectorOrNil cacheTag extent result | <var: #pic type: #'CogMethod *'> <var: #targetMethod type: #'CogMethod *'> "Whether we can relink to a PIC or not we need to pop off the inner return and identify the target method." innerReturn := coInterpreter popStack. targetMethod := self cCoerceSimple: innerReturn - missOffset to: #'CogMethod *'. outerReturn := coInterpreter stackTop. self assert: (outerReturn between: methodZoneBase and: methodZone freeStart). entryPoint := backEnd callTargetFromReturnAddress: outerReturn. self assert: targetMethod selector ~= objectMemory nilObject. self cppIf: NewspeakVM ifTrue: [self assert: (targetMethod asInteger + cmEntryOffset = entryPoint or: [targetMethod asInteger + cmDynSuperEntryOffset = entryPoint]). "Avoid the effort of implementing PICs for the relatively low dynamic frequency dynamic super send and simply rebind the send site." targetMethod asInteger + cmDynSuperEntryOffset = entryPoint ifTrue: [^coInterpreter ceDynamicSuperSend: targetMethod selector to: receiver numArgs: targetMethod cmNumArgs]]. self assert: targetMethod asInteger + cmEntryOffset = entryPoint. self lookup: targetMethod selector for: receiver methodAndErrorSelectorInto: [:method :errsel| newTargetMethodOrNil := method. errorSelectorOrNil := errsel]. "We assume lookupAndCog:for: will *not* reclaim the method zone" self assert: outerReturn = coInterpreter stackTop. cacheTag := objectRepresentation inlineCacheTagForInstance: receiver. ((errorSelectorOrNil notNil and: [errorSelectorOrNil ~= SelectorDoesNotUnderstand]) or: [(objectRepresentation inlineCacheTagIsYoung: cacheTag) or: [newTargetMethodOrNil isNil or: [objectMemory isYoung: newTargetMethodOrNil]]]) ifTrue: [result := self patchToOpenPICFor: targetMethod selector numArgs: targetMethod cmNumArgs receiver: receiver. self assert: result not. "If patchToOpenPICFor:.. returns we're out of code memory" ^coInterpreter ceSendFromInLineCacheMiss: targetMethod]. "See if an Open PIC is already available." pic := methodZone openPICWithSelector: targetMethod selector. pic isNil ifTrue: ["otherwise attempt to create a closed PIC for the two cases." pic := self cogPICSelector: targetMethod selector numArgs: targetMethod cmNumArgs Case0Method: targetMethod Case1Method: newTargetMethodOrNil tag: cacheTag isMNUCase: errorSelectorOrNil = SelectorDoesNotUnderstand. + (pic asInteger between: MaxNegativeErrorCode and: -1) ifTrue: - pic asInteger < 0 ifTrue: ["For some reason the PIC couldn't be generated, most likely a lack of code memory. Continue as if this is an unlinked send." pic asInteger = InsufficientCodeSpace ifTrue: [coInterpreter callForCogCompiledCodeCompaction]. ^coInterpreter ceSendFromInLineCacheMiss: targetMethod]. processor flushICacheFrom: pic asInteger to: pic asInteger + closedPICSize]. "Relink the send site to the pic." extent := backEnd rewriteCallAt: outerReturn target: pic asInteger + cmEntryOffset. processor flushICacheFrom: outerReturn - 1 - extent to: outerReturn - 1. "Jump back into the pic at its entry in case this is an MNU (newTargetMethodOrNil is nil)" coInterpreter executeCogMethodFromLinkedSend: pic withReceiver: receiver andCacheTag: (backEnd inlineCacheTagAt: outerReturn). "NOTREACHED" ^nil!

1 0

[commit][2742] Fix snafu in newspeak build scripts.
by commits＠squeakvm.org 12 Jun '13

12 Jun '13

Revision: 2742 Author: eliot Date: 2013-06-12 14:59:13 -0700 (Wed, 12 Jun 2013) Log Message: ----------- Fix snafu in newspeak build scripts. Can't assume install directory exists when parsing possible -copysource arg. Modified Paths: -------------- branches/Cog/nscogbuild/unixbuild/astbld/mvm branches/Cog/nscogbuild/unixbuild/astbldt/mvm branches/Cog/nscogbuild/unixbuild/bld/mvm branches/Cog/nscogbuild/unixbuild/bldt/mvm branches/Cog/nscogbuild/unixbuild/dbgbld/mvm branches/Cog/nscogbuild/unixbuild/dbgbldt/mvm Modified: branches/Cog/nscogbuild/unixbuild/astbld/mvm =================================================================== --- branches/Cog/nscogbuild/unixbuild/astbld/mvm 2013-06-12 19:40:48 UTC (rev 2741) +++ branches/Cog/nscogbuild/unixbuild/astbld/mvm 2013-06-12 21:59:13 UTC (rev 2742) @@ -1,7 +1,10 @@ #!/bin/bash INSTALLDIR=nsvmlinuxast -if [ $# -ge 1 -a -d "$1" ]; then - INSTALLDIR="$1"; shift +if [ $# -ge 1 ]; then + case "$1" in + -*) ;; + *) INSTALLDIR="$1"; shift + esac fi OPT=-O1 Modified: branches/Cog/nscogbuild/unixbuild/astbldt/mvm =================================================================== --- branches/Cog/nscogbuild/unixbuild/astbldt/mvm 2013-06-12 19:40:48 UTC (rev 2741) +++ branches/Cog/nscogbuild/unixbuild/astbldt/mvm 2013-06-12 21:59:13 UTC (rev 2742) @@ -1,8 +1,11 @@ #!/bin/bash # VM with VM profiler and threaded heartbeat assuming multiple thread priorities INSTALLDIR=nsvmlinuxastpt -if [ $# -ge 1 -a -d "$1" ]; then - INSTALLDIR="$1"; shift +if [ $# -ge 1 ]; then + case "$1" in + -*) ;; + *) INSTALLDIR="$1"; shift + esac fi OPT=-O1 Modified: branches/Cog/nscogbuild/unixbuild/bld/mvm =================================================================== --- branches/Cog/nscogbuild/unixbuild/bld/mvm 2013-06-12 19:40:48 UTC (rev 2741) +++ branches/Cog/nscogbuild/unixbuild/bld/mvm 2013-06-12 21:59:13 UTC (rev 2742) @@ -1,7 +1,10 @@ #!/bin/bash INSTALLDIR=nsvmlinux -if [ $# -ge 1 -a -d "$1" ]; then - INSTALLDIR="$1"; shift +if [ $# -ge 1 ]; then + case "$1" in + -*) ;; + *) INSTALLDIR="$1"; shift + esac fi # Some gcc versions create a broken VM using -O2 case `gcc -v 2>&1 | grep version | sed 's/gcc version *//'` in Modified: branches/Cog/nscogbuild/unixbuild/bldt/mvm =================================================================== --- branches/Cog/nscogbuild/unixbuild/bldt/mvm 2013-06-12 19:40:48 UTC (rev 2741) +++ branches/Cog/nscogbuild/unixbuild/bldt/mvm 2013-06-12 21:59:13 UTC (rev 2742) @@ -1,8 +1,11 @@ #!/bin/bash # VM with VM profiler and threaded heartbeat assuming multiple thread priorities INSTALLDIR=nsvmlinuxpt -if [ $# -ge 1 -a -d "$1" ]; then - INSTALLDIR="$1"; shift +if [ $# -ge 1 ]; then + case "$1" in + -*) ;; + *) INSTALLDIR="$1"; shift + esac fi # Some gcc versions create a broken VM using -O2 case `gcc -v 2>&1 | grep version | sed 's/gcc version *//'` in Modified: branches/Cog/nscogbuild/unixbuild/dbgbld/mvm =================================================================== --- branches/Cog/nscogbuild/unixbuild/dbgbld/mvm 2013-06-12 19:40:48 UTC (rev 2741) +++ branches/Cog/nscogbuild/unixbuild/dbgbld/mvm 2013-06-12 21:59:13 UTC (rev 2742) @@ -1,7 +1,10 @@ #!/bin/bash INSTALLDIR=nsvmlinuxdbg -if [ $# -ge 1 -a -d "$1" ]; then - INSTALLDIR="$1"; shift +if [ $# -ge 1 ]; then + case "$1" in + -*) ;; + *) INSTALLDIR="$1"; shift + esac fi OPT=-O0 Modified: branches/Cog/nscogbuild/unixbuild/dbgbldt/mvm =================================================================== --- branches/Cog/nscogbuild/unixbuild/dbgbldt/mvm 2013-06-12 19:40:48 UTC (rev 2741) +++ branches/Cog/nscogbuild/unixbuild/dbgbldt/mvm 2013-06-12 21:59:13 UTC (rev 2742) @@ -1,8 +1,11 @@ #!/bin/bash # VM with VM profiler and threaded heartbeat assuming multiple thread priorities INSTALLDIR=nsvmlinuxdbgpt -if [ $# -ge 1 -a -d "$1" ]; then - INSTALLDIR="$1"; shift +if [ $# -ge 1 ]; then + case "$1" in + -*) ;; + *) INSTALLDIR="$1"; shift + esac fi OPT=-O0

1 0

← Newer
1
2
3
4
5
6
7
8
9
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

Vm-dev June 2013