Vm-dev November 2014

vm-dev@lists.squeakfoundation.org

36 participants
165 discussions

[commit][3139] update some ARM specific bitblt code for the new pixel/ color compare prim
by commits＠squeakvm.org 21 Nov '14

21 Nov '14

Revision: 3139 Author: rowledge Date: 2014-11-20 19:38:51 -0800 (Thu, 20 Nov 2014) Log Message: ----------- update some ARM specific bitblt code for the new pixel/color compare prim Modified Paths: -------------- trunk/platforms/Cross/plugins/BitBltPlugin/BitBltArmSimd.c trunk/platforms/Cross/plugins/BitBltPlugin/BitBltArmSimdAsm.hdr 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 Paths: ----------- trunk/platforms/Cross/plugins/BitBltPlugin/BitBltArmSimdCompare.s Modified: trunk/platforms/Cross/plugins/BitBltPlugin/BitBltArmSimd.c =================================================================== --- trunk/platforms/Cross/plugins/BitBltPlugin/BitBltArmSimd.c 2014-11-21 02:57:22 UTC (rev 3138) +++ trunk/platforms/Cross/plugins/BitBltPlugin/BitBltArmSimd.c 2014-11-21 03:38:51 UTC (rev 3139) @@ -257,8 +257,57 @@ { fastPathBitAnd32_32, CR_bitAnd, STD_FLAGS(32,32,NO,NO) }, }; +#define TALLY_FAST_PATH(op, srcA_bpp, srcB_bpp) \ +extern uint32_t armSimd##op##Tally##srcB_bpp##_##srcA_bpp##_wide (uint32_t width, uint32_t height, uint32_t *srcA, uint32_t srcAStride, uint32_t *srcB, uint32_t srcBStride, uint32_t colorA, uint32_t colorB, void *unused, uint32_t bitPtrs); \ +extern uint32_t armSimd##op##Tally##srcB_bpp##_##srcA_bpp##_narrow(uint32_t width, uint32_t height, uint32_t *srcA, uint32_t srcAStride, uint32_t *srcB, uint32_t srcBStride, uint32_t colorA, uint32_t colorB, void *unused, uint32_t bitPtrs); \ +extern uint32_t armSimd##op##Tally##srcB_bpp##_##srcA_bpp##_tiny (uint32_t width, uint32_t height, uint32_t *srcA, uint32_t srcAStride, uint32_t *srcB, uint32_t srcBStride, uint32_t colorA, uint32_t colorB, void *unused, uint32_t bitPtrs); \ +static uint32_t tallyFastPath##op##srcA_bpp##_##srcB_bpp(compare_operation_t *op, uint32_t log2bppA, uint32_t log2bppB) \ +{ \ + IGNORE(log2bppA); \ + IGNORE(log2bppB); \ + COPY_COMPARE_OP_TO_LOCALS(op, uint32_t, uint32_t); \ + /* Get pointers to initial words */ \ + uint32_t *srcA = srcABits + srcAPitch * srcAY + srcAX * srcA_bpp / 32; \ + uint32_t *srcB = srcBBits + srcBPitch * srcBY + srcBX * srcB_bpp / 32; \ + /* Get initial pixel offset within words, mangle into pitch if possible */ \ + uint32_t bitPtrs = 0; \ + uint32_t srcAXpix = srcAX & (31 / srcA_bpp); \ + if (srcA_bpp < 8) \ + bitPtrs = srcAXpix; \ + else if (srcA_bpp == 8 || srcA_bpp == 16) \ + srcAPitch |= srcAXpix << 30; \ + uint32_t srcBXpix = srcBX & (31 / srcB_bpp); \ + if (srcB_bpp < 8) \ + bitPtrs |= srcBXpix << 27; \ + else if (srcB_bpp == 8 || srcB_bpp == 16) \ + srcBPitch |= srcBXpix << 30; \ + /* Adjust strides to remove number of words partially or wholly read/written */ \ + srcAPitch -= (srcA_bpp * (srcAXpix + width) + 31) / 32; \ + srcBPitch -= (srcB_bpp * (srcBXpix + width) + 31) / 32; \ + /* 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)/srcA_bpp && (((srcAXpix-1) ^ (srcAXpix+width-(128-32)/srcA_bpp)) &~ (31/srcA_bpp))) \ + return armSimd##op##Tally##srcB_bpp##_##srcA_bpp##_wide(width, height, srcA, srcAPitch, srcB, srcBPitch, colorA, colorB, 0, bitPtrs); \ + else if (srcA_bpp > 8 || (((srcAXpix-1) ^ (srcAXpix+width)) &~ (31/srcA_bpp))) \ + return armSimd##op##Tally##srcB_bpp##_##srcA_bpp##_narrow(width, height, srcA, srcAPitch, srcB, srcBPitch, colorA, colorB, 0, bitPtrs); \ + else \ + return armSimd##op##Tally##srcB_bpp##_##srcA_bpp##_tiny(width, height, srcA, srcAPitch, srcB, srcBPitch, colorA, colorB, 0, bitPtrs); \ +} + +#define ADD_TALLY_FN(op, srcA_bpp, srcB_bpp) \ + do { compareColorsFns[(((MR_##op * 2) + 1) * 3 + \ + (srcA_bpp == 8 ? 0 : srcA_bpp == 16 ? 1 : 2)) * 3 + \ + (srcB_bpp == 8 ? 0 : srcB_bpp == 16 ? 1 : 2)] = \ + tallyFastPath##op##srcA_bpp##_##srcB_bpp; } while(0) + +TALLY_FAST_PATH(pixelMatch, 32, 32) + void addArmSimdFastPaths(void) { addFastPaths(fastPaths, sizeof fastPaths / sizeof *fastPaths); + + ADD_TALLY_FN(pixelMatch, 32, 32); } - Modified: trunk/platforms/Cross/plugins/BitBltPlugin/BitBltArmSimdAsm.hdr =================================================================== --- trunk/platforms/Cross/plugins/BitBltPlugin/BitBltArmSimdAsm.hdr 2014-11-21 02:57:22 UTC (rev 3138) +++ trunk/platforms/Cross/plugins/BitBltPlugin/BitBltArmSimdAsm.hdr 2014-11-21 03:38:51 UTC (rev 3139) @@ -41,18 +41,20 @@ 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 +FLAG_DST_READONLY * 2 :SHL: 3 +FLAG_DST_ACCESS * 3 :SHL: 3 +FLAG_SPILL_NO_LINE_VARS * 0 :SHL: 5 +FLAG_SPILL_LINE_VARS_WIDE * 1 :SHL: 5 +FLAG_SPILL_LINE_VARS_NON_WIDE * 2 :SHL: 5 +FLAG_SPILL_LINE_VARS * 3 :SHL: 5 +FLAG_EXPAND_SKEW * 0 :SHL: 7 +FLAG_NO_EXPAND_SKEW * 1 :SHL: 7 +FLAG_PROCESS_SERIAL * 0 :SHL: 8 ; sub-word data is presented MS-aligned, and results are expected LS-aligned +FLAG_PROCESS_PARALLEL * 1 :SHL: 8 ; sub-word data retains its original alignment throughout (only useful if src & dest depths same) +FLAG_MAX_128BIT_MACRO * 0 :SHL: 9 +FLAG_MAX_256BIT_MACRO * 1 :SHL: 9 ; particularly tight loops can sometimes benefit from being unrolled to allow 2x 128-bit blocks to be staggered +FLAG_PRELOAD_DST * 0 :SHL: 10 +FLAG_NO_PRELOAD_DST * 1 :SHL: 10 ; Offsets into stack GBLA args_stack_offset @@ -676,6 +678,7 @@ MACRO $lab WriteFirstSubWord $base, $data, $pixels, $tmp1, $tmp2 + ASSERT (flags :AND: FLAG_DST_ACCESS) <> FLAG_DST_READONLY ; It is assumed that there is at least 1 pixel to write LCLS reg0 reg0 LookupWk $data @@ -719,6 +722,7 @@ MACRO $lab WriteLastSubWord $base, $data, $pixels, $aligned, $tmp1, $tmp2 + ASSERT (flags :AND: FLAG_DST_ACCESS) <> FLAG_DST_READONLY ; It is assumed that there is at least 1 pixel to write LCLS reg0 reg0 LookupWk $data @@ -810,7 +814,8 @@ reg0 LookupWk $first Print Data, "Write1Word: %08X @%p\n", $reg0, $base $lab - IF (flags :AND: FLAG_DST_READWRITE) > 0 + ASSERT (flags :AND: FLAG_DST_ACCESS) <> FLAG_DST_READONLY + IF (flags :AND: FLAG_DST_ACCESS) = FLAG_DST_READWRITE STR $reg0, [$base, #-4] ; base is assumed previously updated during read ELSE STR $reg0, [$base], #4 @@ -829,7 +834,8 @@ ] Print Data, "Write2Words: %08X %08X @%p\n", $reg0, $reg1, $base $lab - IF (flags :AND: FLAG_DST_READWRITE) > 0 + ASSERT (flags :AND: FLAG_DST_ACCESS) <> FLAG_DST_READONLY + IF (flags :AND: FLAG_DST_ACCESS) = FLAG_DST_READWRITE STMDB $base, {$reg0, $reg1} ; base is assumed previously updated during read ELSE STMIA $base!, {$reg0, $reg1} @@ -861,7 +867,8 @@ Print Data, "Write4Words: %08X %08X", $reg0, $reg1 Print Data, " %08X %08X @%p\n", $reg2, $reg3, $base $lab - IF (flags :AND: FLAG_DST_READWRITE) > 0 + ASSERT (flags :AND: FLAG_DST_ACCESS) <> FLAG_DST_READONLY + IF (flags :AND: FLAG_DST_ACCESS) = FLAG_DST_READWRITE STMDB $base, {$reg0, $reg1, $reg2, $reg3} ; base is assumed previously updated during read ELSE STMIA $base!, {$reg0, $reg1, $reg2, $reg3} @@ -876,11 +883,13 @@ [ dst_w_bpp < 32 ANDS scratch, $pixels, #32/dst_w_bpp - 1 BEQ %FT02 - [ flags :AND: FLAG_DST_READWRITE > 0 + IF (flags :AND: FLAG_DST_ACCESS) = FLAG_DST_READWRITE LDR $wk1, [dst] - ] + ELIF (flags :AND: FLAG_DST_ACCESS) = FLAG_DST_READONLY + LDR $wk1, [dst], #4 + ENDIF [ flags :AND: FLAG_PROCESS_PARALLEL = 0 - [ flags :AND: FLAG_DST_READWRITE > 0 + [ (flags :AND: FLAG_DST_ACCESS) <> FLAG_DST_WRITEONLY MOV scratch, scratch, LSL #dst_bpp_shift MOV $wk1, $wk1, ROR scratch ] @@ -895,8 +904,11 @@ 01 pow2 SETA pow2 * 2 WEND + [ (flags :AND: FLAG_DST_ACCESS) <> FLAG_DST_READONLY WriteFirstSubWord dst, 1, $pixels, scratch, $wk2 + ] | + ASSERT (flags :AND: FLAG_DST_ACCESS) <> FLAG_DST_READONLY ; Can't really do read-only 32-bit processing without an indication of which bits are valid $prefix._32bits $wk0, $wk1, $fixed_skew ; and return result in $wk0 WriteFirstSubWord dst, 0, $pixels, scratch, $wk2 ] @@ -945,9 +957,11 @@ [ dst_w_bpp < 32 TST $pixels, #32/dst_w_bpp - 1 BEQ %FT02 - [ flags :AND: FLAG_DST_READWRITE > 0 + IF (flags :AND: FLAG_DST_ACCESS) = FLAG_DST_READWRITE LDR $wk1, [dst] - ] + ELIF (flags :AND: FLAG_DST_ACCESS) = FLAG_DST_READONLY + LDR $wk1, [dst], #4 + ENDIF [ flags :AND: FLAG_PROCESS_PARALLEL = 0 LCLA pow2 LCLS pow2str @@ -968,8 +982,11 @@ 01 pow2 SETA pow2 / 2 WEND + [ (flags :AND: FLAG_DST_ACCESS) <> FLAG_DST_READONLY WriteLastSubWord dst, 1, $pixels, ls_aligned, scratch, $wk0 + ] | + ASSERT (flags :AND: FLAG_DST_ACCESS) <> FLAG_DST_READONLY ; Can't really do read-only 32-bit processing without an indication of which bits are valid ReadLastSubWord src, 0, carry, $pixels, $fixed_skew, skew, scratch $prefix._32bits $wk0, $wk1, $fixed_skew ; and return result in $wk0 WriteLastSubWord dst, 0, $pixels, ms_aligned, scratch, $wk1 @@ -1386,7 +1403,7 @@ src_bpp_shift Log2 src_bpp dst_bpp_shift Log2 dst_w_bpp - [ flags :AND: FLAG_DST_READWRITE = 0 + [ (flags :AND: FLAG_DST_ACCESS) = FLAG_DST_WRITEONLY dst_r_bpp SETA 0 | dst_r_bpp SETA dst_w_bpp @@ -1520,7 +1537,7 @@ dst_prefetch_offset SETA 0 ] 52 - WHILE dst_prefetch_offset <= 0 + WHILE dst_prefetch_offset <> 16 subblock SETA 0 WHILE subblock < pix_per_block*dst_w_bpp/128 [ dst_w_bpp > 4 * src_bpp :LAND: src_bpp > 0 @@ -1573,7 +1590,7 @@ WEND SUBS x, x, #pix_per_block BHS %BT52 - [ dst_prefetch_offset < 0 + [ dst_prefetch_offset = -16 B %FT55 54 ] Added: trunk/platforms/Cross/plugins/BitBltPlugin/BitBltArmSimdCompare.s =================================================================== --- trunk/platforms/Cross/plugins/BitBltPlugin/BitBltArmSimdCompare.s (rev 0) +++ trunk/platforms/Cross/plugins/BitBltPlugin/BitBltArmSimdCompare.s 2014-11-21 03:38:51 UTC (rev 3139) @@ -0,0 +1,102 @@ +; +; Copyright © 2014 Raspberry Pi Foundation +; Copyright © 2014 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 |BitBltArmSimdCompare$$Code|, CODE, READONLY + ARM + +; We use the two halftone arguments/registers to hold the two comparison colours +; and the map register to hold the hit count. +; Source A is referenced by dst/stride_d. +; Source B is referenced by src/stride_s. + +; ******************************************************************** + + MACRO + pixelMatchTally32_32_init + MOV map, #0 + MEND + + MACRO + pixelMatchTally32_32_cleanup + MOV a1, map + MEND + + MACRO + pixelMatchTally32_32_1pixel $srcA, $srcB + EOR $srcA, $srcA, ht + CLZ $srcA, $srcA ; bit 5 set => all bits were 0 + TEQ $srcB, ht_info + ADDEQ map, map, $srcA, LSR #5 + MEND + + MACRO + pixelMatchTally32_32_32bits $src, $dst, $fixed_skew + Read1Word dst, 0,, 0 + Read1Word src, 1, carry, $fixed_skew, skew, scratch + pixelMatchTally32_32_1pixel $wk0, $wk1 + MEND + + MACRO + pixelMatchTally32_32_64bits $src, $fixed_skew + Read2Words dst, 0,, 0 + Read2Words src, 2, carry, $fixed_skew, skew, scratch + pixelMatchTally32_32_1pixel $wk0, $wk2 + pixelMatchTally32_32_1pixel $wk1, $wk3 + MEND + + MACRO + pixelMatchTally32_32_128bits_head $src, $fixed_skew, $intra_preloads + Read4Words dst, 0,, 0 + Read4Words src, 4, carry, $fixed_skew, skew, scratch + MEND + + MACRO + pixelMatchTally32_32_128bits_tail $src + pixelMatchTally32_32_1pixel $wk0, $wk4 + pixelMatchTally32_32_1pixel $wk1, $wk5 + pixelMatchTally32_32_1pixel $wk2, $wk6 + pixelMatchTally32_32_1pixel $wk3, $wk7 + 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, $reinitwk, $cleanup + +pixelMatchTally GenerateFunctions 32, 32,, \ + FLAG_VECTOR_HALFTONE :OR: FLAG_DST_READONLY :OR: FLAG_SPILL_LINE_VARS, 2, \ + "y,stride_d,stride_s,bitptrs,skew,orig_w,scratch,carry", \ + "x,y,stride_d,stride_s", orig_w,, init,,, cleanup ; leading_pixels_reg = wk5 + +; ******************************************************************** + + END Modified: trunk/platforms/Cross/plugins/BitBltPlugin/BitBltDispatch.c =================================================================== --- trunk/platforms/Cross/plugins/BitBltPlugin/BitBltDispatch.c 2014-11-21 02:57:22 UTC (rev 3138) +++ trunk/platforms/Cross/plugins/BitBltPlugin/BitBltDispatch.c 2014-11-21 03:38:51 UTC (rev 3139) @@ -90,7 +90,10 @@ static const unsigned int maskTable85[4] = { 0xF80000, 0x00F800, 0x0000F8, 0x000000 }; static const int shiftTable85[4] = { -9, -6, -3, 0 }; +/** The dispatch table for >= 8bpp big-endian compareColors functions */ +compare_colors_fn_t compareColorsFns[3*2*3*3]; + #ifdef PROFILING static uint64_t gettime(void) { @@ -436,3 +439,33 @@ #endif } +sqInt compareColorsDispatch(compare_operation_t *op) +{ + uint32_t log2bppA; + uint32_t log2bppB; + switch (op->srcA.depth) + { + case 1: log2bppA = 0; break; + case 2: log2bppA = 1; break; + case 4: log2bppA = 2; break; + case 8: log2bppA = 3; break; + case 16: log2bppA = 4; break; + case 32: log2bppA = 5; break; + default: abort(); + } + switch (op->srcB.depth) + { + case 1: log2bppB = 0; break; + case 2: log2bppB = 1; break; + case 4: log2bppB = 2; break; + case 8: log2bppB = 3; break; + case 16: log2bppB = 4; break; + case 32: log2bppB = 5; break; + default: abort(); + } + if (log2bppA < 3 || log2bppB < 3 || !op->srcA.msb || !op->srcB.msb) + /* These cases aren't catered for by the function table */ + return genericCompareColors(op, log2bppA, log2bppB); + else + return compareColorsFns[(((op->matchRule * 2) + op->tally) * 3 + (log2bppA - 3)) * 3 + (log2bppB - 3)](op, log2bppA, log2bppB); +} Modified: trunk/platforms/Cross/plugins/BitBltPlugin/BitBltDispatch.h =================================================================== --- trunk/platforms/Cross/plugins/BitBltPlugin/BitBltDispatch.h 2014-11-21 02:57:22 UTC (rev 3138) +++ trunk/platforms/Cross/plugins/BitBltPlugin/BitBltDispatch.h 2014-11-21 03:38:51 UTC (rev 3139) @@ -82,6 +82,13 @@ } combination_rule_t; +typedef enum { + MR_pixelMatch, /* 0 */ + MR_notAnotB, /* 1 */ + MR_notAmatchB, /* 2 */ +} +match_rule_t; + typedef struct { void *bits; usqInt depth; @@ -119,7 +126,24 @@ } operation_t; +typedef struct { + match_rule_t matchRule; + bool tally; + src_or_dest_t srcA; + src_or_dest_t srcB; + usqInt width; + usqInt height; + usqInt colorA; + usqInt colorB; +} +compare_operation_t; + +typedef usqInt (*compare_colors_fn_t)(compare_operation_t *op, usqInt log2bppA, usqInt log2bppB); + +extern compare_colors_fn_t compareColorsFns[3*2*3*3]; + void initialiseCopyBits(void); void copyBitsDispatch(operation_t *op); +sqInt compareColorsDispatch(compare_operation_t *op); #endif /* BITBLTDISPATCH_H_ */ Modified: trunk/platforms/Cross/plugins/BitBltPlugin/BitBltGeneric.c =================================================================== --- trunk/platforms/Cross/plugins/BitBltPlugin/BitBltGeneric.c 2014-11-21 02:57:22 UTC (rev 3138) +++ trunk/platforms/Cross/plugins/BitBltPlugin/BitBltGeneric.c 2014-11-21 03:38:51 UTC (rev 3139) @@ -456,8 +456,96 @@ { fastPathDepthConv, CR_any, FAST_PATH_SRC_0BPP | FAST_PATH_SRC_1BPP | ONLY_DEST_1BPP }, }; +static uint32_t genericCompareRow(uint32_t width, + const uint32_t *ptrA, + const uint32_t *ptrB, + uint32_t colorA, + uint32_t colorB, + uint32_t pixelIndexes, + match_rule_t matchRule, + bool tally, + uint32_t bppA, + uint32_t bppB, + uint32_t ppwA, + uint32_t ppwB, + bool msbA, + bool msbB) +{ + uint32_t count = 0; + uint32_t a32 = *ptrA++; + uint32_t b32 = *ptrB++; + if (msbA) + a32 <<= bppA * (pixelIndexes & 0x1F); + else + a32 >>= bppA * (pixelIndexes & 0x1F); + if (msbB) + b32 <<= bppB * (pixelIndexes >> 27); + else + b32 >>= bppB * (pixelIndexes >> 27); + while (width > 0) + { + uint32_t a = msbA ? a32 >> (32-bppA) : a32 & ((1<<bppA)-1); + uint32_t b = msbB ? b32 >> (32-bppB) : b32 & ((1<<bppB)-1); + uint32_t nextPixelIndexes; + if (matchRule == MR_pixelMatch) + count += a == colorA && b == colorB; + else if (matchRule == MR_notAnotB) + count += a != colorA && b != colorB; + else // MR_notAmatchB + count += a != colorA && b == colorB; + if (count && !tally) + return count; + if (--width == 0) + break; + nextPixelIndexes = pixelIndexes + 1 + (1<<27); + if (nextPixelIndexes & ppwA) + { + a32 = *ptrA++; + nextPixelIndexes -= ppwA; + } + if (ppwB == 32) + { + if (nextPixelIndexes < pixelIndexes) + b32 = *ptrB++; + } + else + { + if (nextPixelIndexes & (ppwB<<27)) + { + b32 = *ptrB++; + nextPixelIndexes -= ppwB<<27; + } + } + pixelIndexes = nextPixelIndexes; + } + return count; +} + +uint32_t genericCompareColors(compare_operation_t *op, uint32_t log2bppA, uint32_t log2bppB) +{ + uint32_t count = 0; + uint32_t pixelIndexes; + COPY_COMPARE_OP_TO_LOCALS(op, uint32_t, uint32_t); + srcABits += srcAY * srcAPitch + srcAX >> (5 - log2bppA); + srcBBits += srcBY * srcBPitch + srcBX >> (5 - log2bppB); + pixelIndexes = (srcAX & (srcADepth - 1)) + ((srcBX & (srcBDepth - 1)) << 27); + /* This routine is never going to be especially fast, so just use a simple loop */ + while (height--) + { + count += genericCompareRow(width, srcABits, srcBBits, colorA, colorB, pixelIndexes, + matchRule, tally, srcADepth, srcBDepth, 32 >> log2bppA, 32 >> log2bppB, srcAMSB, srcBMSB); + if (count && !tally) + return count; + srcABits += srcAPitch; + srcBBits += srcBPitch; + } + return count; +} + void addGenericFastPaths(void) { + int i; addFastPaths(fastPaths, sizeof fastPaths / sizeof *fastPaths); + for (i = 0; i < sizeof compareColorsFns / sizeof *compareColorsFns; i++) + compareColorsFns[i] = genericCompareColors; } - Modified: trunk/platforms/Cross/plugins/BitBltPlugin/BitBltGeneric.h =================================================================== --- trunk/platforms/Cross/plugins/BitBltPlugin/BitBltGeneric.h 2014-11-21 02:57:22 UTC (rev 3138) +++ trunk/platforms/Cross/plugins/BitBltPlugin/BitBltGeneric.h 2014-11-21 03:38:51 UTC (rev 3139) @@ -27,5 +27,6 @@ #define BITBLTGENERIC_H_ void addGenericFastPaths(void); +uint32_t genericCompareColors(compare_operation_t *op, uint32_t log2bppA, uint32_t log2bppB); #endif /* BITBLTGENERIC_H_ */ Modified: trunk/platforms/Cross/plugins/BitBltPlugin/BitBltInternal.h =================================================================== --- trunk/platforms/Cross/plugins/BitBltPlugin/BitBltInternal.h 2014-11-21 02:57:22 UTC (rev 3138) +++ trunk/platforms/Cross/plugins/BitBltPlugin/BitBltInternal.h 2014-11-21 03:38:51 UTC (rev 3139) @@ -125,7 +125,7 @@ /** This macro basically tells the compiler that the pointer to the * "op" structure doesn't alias with any other pointers. I'd use the * restrict keyword instead, but Squeak is built C89. */ -#define COPY_OP_TO_LOCALS(op, src_type, dest_type) \ +#define COPY_OP_TO_LOCALS(op, src_type, dest_type) \ combination_rule_t combinationRule = op->combinationRule; \ bool noSource = op->noSource; \ src_type *srcBits = op->src.bits; \ @@ -175,7 +175,45 @@ IGNORE(halftoneHeight); \ IGNORE(halftoneBase); \ +#define COPY_COMPARE_OP_TO_LOCALS(op, srcA_type, srcB_type) \ + match_rule_t matchRule = op->matchRule; \ + bool tally = op->tally; \ + srcA_type *srcABits = op->srcA.bits; \ + uint32_t srcADepth = op->srcA.depth; \ + uint32_t srcAPitch = op->srcA.pitch / sizeof (srcA_type); \ + bool srcAMSB = op->srcA.msb; \ + uint32_t srcAX = op->srcA.x; \ + uint32_t srcAY = op->srcA.y; \ + srcB_type *srcBBits = op->srcB.bits; \ + uint32_t srcBDepth = op->srcB.depth; \ + uint32_t srcBPitch = op->srcB.pitch / sizeof (srcB_type); \ + bool srcBMSB = op->srcB.msb; \ + uint32_t srcBX = op->srcB.x; \ + uint32_t srcBY = op->srcB.y; \ + uint32_t width = op->width; \ + uint32_t height = op->height; \ + uint32_t colorA = op->colorA; \ + uint32_t colorB = op->colorB; \ + IGNORE(matchRule); \ + IGNORE(tally); \ + IGNORE(srcABits); \ + IGNORE(srcADepth); \ + IGNORE(srcAPitch); \ + IGNORE(srcAMSB); \ + IGNORE(srcAX); \ + IGNORE(srcAY); \ + IGNORE(srcBBits); \ + IGNORE(srcBDepth); \ + IGNORE(srcBPitch); \ + IGNORE(srcBMSB); \ + IGNORE(srcBX); \ + IGNORE(srcBY); \ + IGNORE(width); \ + IGNORE(height); \ + IGNORE(colorA); \ + IGNORE(colorB); \ + typedef struct { void (*func)(operation_t *, uint32_t); combination_rule_t combinationRule;

1 0

Re: [Vm-dev] VM Maker: VMMaker.oscog-tpr.949.mcz
by tim Rowledge 21 Nov '14

21 Nov '14

On 21-11-2014, at 3:29 AM, commits(a)source.squeak.org wrote: > > tim Rowledge uploaded a new version of VMMaker to project VM Maker: > http://source.squeak.org/VMMaker/VMMaker.oscog-tpr.949.mcz > > ==================== Summary ==================== > > Name: VMMaker.oscog-tpr.949 > Author: tpr > Time: 20 November 2014, 7:28:47.525 pm > UUID: f88be574-4771-44fb-a08e-f1312faaec73 > Ancestors: VMMaker.oscog-eem.948 > > Add the correct init code for the fast bitblt extensions (its in the plain interp but got left out of the cog code) and add a new bitblt prim to compare two forms for pixel color state; useful for sprite touches sprite type tests and very common in Scratch. WARNING - for a short (I hope!) while until I get the platform files committed properly it will be probably difficult to build an ARM fastblt enabled vm. It might be painful even after that… but let’s hope not. tim -- tim Rowledge; tim(a)rowledge.org; http://www.rowledge.org/tim Useful random insult:- Put a lens in each ear and you've got a telescope.

1 0

VM Maker: VMMaker.oscog-tpr.949.mcz
by commits＠source.squeak.org 21 Nov '14

21 Nov '14

tim Rowledge uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-tpr.949.mcz ==================== Summary ==================== Name: VMMaker.oscog-tpr.949 Author: tpr Time: 20 November 2014, 7:28:47.525 pm UUID: f88be574-4771-44fb-a08e-f1312faaec73 Ancestors: VMMaker.oscog-eem.948 Add the correct init code for the fast bitblt extensions (its in the plain interp but got left out of the cog code) and add a new bitblt prim to compare two forms for pixel color state; useful for sprite touches sprite type tests and very common in Scratch. =============== Diff against VMMaker.oscog-eem.948 =============== Item was changed: ----- Method: BitBltSimulation>>initialiseModule (in category 'initialize-release') ----- initialiseModule <export: true> self initBBOpTable. self initDither8Lookup. + self cppIf: #'ENABLE_FAST_BLT' + ifTrue:[self initialiseCopyBits]. ^true! Item was added: + ----- Method: BitBltSimulation>>primitiveCompareColorA:to:test: (in category 'primitives') ----- + primitiveCompareColorA: colorA to: colorB test: testID + "Invoke the pixel color comparing primitive.Only applicable if compiling + with ENABLE_FAST_BLT" + | rcvr val | + <export: true> + rcvr := self + primitive: 'primitiveCompareColors' + parameters: #(#SmallInteger #SmallInteger #SmallInteger ) + receiver: #Oop. + self + cppIf: #'ENABLE_FAST_BLT' + ifTrue: [(self loadBitBltFrom: rcvr) + ifFalse: [^ interpreterProxy primitiveFail]. + self clipRange. + (bbW <= 0 or: [bbH <= 0]) + ifTrue: ["zero width or height; noop" + ^ interpreterProxy primitiveFail]. + self cCode: ' + compare_operation_t op; + op.matchRule = testID & 3; + op.tally = testID & (1u<<3); + op.srcA.bits = (void *) sourceBits; + op.srcA.pitch = sourcePitch; + op.srcA.depth = sourceDepth; + op.srcA.msb = sourceMSB; + op.srcA.x = sx; + op.srcA.y = sy; + op.srcB.bits = (void *) destBits; + op.srcB.pitch = destPitch; + op.srcB.depth = destDepth; + op.srcB.msb = destMSB; + op.srcB.x = dx; + op.srcB.y = dy; + op.width = bbW; + op.height = bbH; + op.colorA = colorA; + op.colorB = colorB; + + val = compareColorsDispatch(&op);'. + ^val asPositiveIntegerObj] + ifFalse: [interpreterProxy primitiveFail]!

1 0

[commit][3138] CogVM source as per VMMaker.oscog-eem.948
by commits＠squeakvm.org 21 Nov '14

21 Nov '14

Revision: 3138 Author: eliot Date: 2014-11-20 18:57:22 -0800 (Thu, 20 Nov 2014) Log Message: ----------- CogVM source as per VMMaker.oscog-eem.948 Spur: Fix regression in primitiveNewWithArg from VMMaker.oscog-eem.859 which caused basicNew: on fixed classes to raise OutOfMemory instead of the relevant error. Have checkForAndFollowForwardedPrimitiveState follow other referencesin the frame if a forwarder is found on the stack. All: Add a first cut at the primitiveSlotAt[Put] primitives. Reimplement primitiveBitShift for 64-bits. Define areIntegers:and: for 64-bit Spur, and move it into the ObjectMemory hierarchies. Add maxSmallInteger and minSmallInteger and matching manifest constants. Use these in LargeIntegersPlugin and Matrix2x3Plugin. Use numBytesOf: instead of lengthOf: in the 64-bit integer conversion routines. Reorder cases in Spur's numBytesOf: to put common case first. Modified Paths: -------------- branches/Cog/nscogsrc/plugins/AioPlugin/AioPlugin.c branches/Cog/nscogsrc/plugins/LargeIntegers/LargeIntegers.c branches/Cog/nscogsrc/plugins/Matrix2x3Plugin/Matrix2x3Plugin.c branches/Cog/nscogsrc/plugins/UnixOSProcessPlugin/UnixOSProcessPlugin.c branches/Cog/nscogsrc/vm/cointerp.c branches/Cog/nscogsrc/vm/cointerp.h branches/Cog/nscogsrc/vm/gcc3x-cointerp.c branches/Cog/nscogsrc/vm/interp.h branches/Cog/nsspursrc/vm/cointerp.c branches/Cog/nsspursrc/vm/cointerp.h branches/Cog/nsspursrc/vm/gcc3x-cointerp.c branches/Cog/nsspursrc/vm/interp.h branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c branches/Cog/nsspurstacksrc/vm/interp.c branches/Cog/nsspurstacksrc/vm/interp.h branches/Cog/sistasrc/vm/cointerp.c branches/Cog/sistasrc/vm/cointerp.h branches/Cog/sistasrc/vm/gcc3x-cointerp.c branches/Cog/sistasrc/vm/interp.h branches/Cog/spursistasrc/vm/cointerp.c branches/Cog/spursistasrc/vm/cointerp.h branches/Cog/spursistasrc/vm/gcc3x-cointerp.c branches/Cog/spursistasrc/vm/interp.h branches/Cog/spursrc/vm/cointerp.c branches/Cog/spursrc/vm/cointerp.h branches/Cog/spursrc/vm/gcc3x-cointerp.c branches/Cog/spursrc/vm/interp.h branches/Cog/spurstacksrc/vm/gcc3x-interp.c branches/Cog/spurstacksrc/vm/interp.c branches/Cog/spurstacksrc/vm/interp.h branches/Cog/src/plugins/AioPlugin/AioPlugin.c branches/Cog/src/plugins/LargeIntegers/LargeIntegers.c branches/Cog/src/plugins/Matrix2x3Plugin/Matrix2x3Plugin.c branches/Cog/src/plugins/UnixOSProcessPlugin/UnixOSProcessPlugin.c branches/Cog/src/vm/cointerp.c branches/Cog/src/vm/cointerp.h branches/Cog/src/vm/cointerpmt.c branches/Cog/src/vm/cointerpmt.h branches/Cog/src/vm/gcc3x-cointerp.c branches/Cog/src/vm/gcc3x-cointerpmt.c branches/Cog/src/vm/interp.h branches/Cog/stacksrc/vm/gcc3x-interp.c branches/Cog/stacksrc/vm/interp.c branches/Cog/stacksrc/vm/interp.h Property Changed: ---------------- branches/Cog/platforms/Cross/vm/sqSCCSVersion.h Modified: branches/Cog/nscogsrc/plugins/AioPlugin/AioPlugin.c =================================================================== --- branches/Cog/nscogsrc/plugins/AioPlugin/AioPlugin.c 2014-11-16 01:45:07 UTC (rev 3137) +++ branches/Cog/nscogsrc/plugins/AioPlugin/AioPlugin.c 2014-11-21 02:57:22 UTC (rev 3138) @@ -1,9 +1,9 @@ /* Automatically generated by - VMPluginCodeGenerator VMMaker.oscog-eem.702 uuid: 2f753471-9a18-4f13-aaef-58ffb0702465 + VMPluginCodeGenerator VMMaker.oscog-eem.948 uuid: 9323b2ad-f5cf-4aca-8f31-67eb5616ccca from - UnixAioPlugin VMConstruction-Plugins-AioPlugin-eem.15 uuid: 0029df1c-3720-4b61-8579-4851417d24a7 + UnixAioPlugin VMConstruction-Plugins-AioPlugin-eem.16 uuid: 88d89f3d-80f8-4dbc-977a-78df02bbe8be */ -static char __buildInfo[] = "UnixAioPlugin VMConstruction-Plugins-AioPlugin-eem.15 uuid: 0029df1c-3720-4b61-8579-4851417d24a7 " __DATE__ ; +static char __buildInfo[] = "UnixAioPlugin VMConstruction-Plugins-AioPlugin-eem.16 uuid: 88d89f3d-80f8-4dbc-977a-78df02bbe8be " __DATE__ ; @@ -123,9 +123,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "AioPlugin VMConstruction-Plugins-AioPlugin-eem.15 (i)" + "AioPlugin VMConstruction-Plugins-AioPlugin-eem.16 (i)" #else - "AioPlugin VMConstruction-Plugins-AioPlugin-eem.15 (e)" + "AioPlugin VMConstruction-Plugins-AioPlugin-eem.16 (e)" #endif ; @@ -161,7 +161,7 @@ fileDescriptorFrom(sqInt aSQFileByteArray) { if (!((((isBytes(aSQFileByteArray)) - && ((byteSizeOf(aSQFileByteArray)) == (fileRecordSize()))) + && ((byteSizeOf(aSQFileByteArray)) == (sizeof(SQFile)))) && ((getThisSessionID()) == (sessionIdentifierFromSqFile(arrayValueOf(aSQFileByteArray))))) && (isNonNullSQFile(aSQFileByteArray)))) { return -1; @@ -255,7 +255,7 @@ sqFileBytes = arrayValueOf(objectPointer); idx = 0; - while (idx < (fileRecordSize())) { + while (idx < (sizeof(SQFile))) { if ((sqFileBytes[idx]) != 0) { return 1; } @@ -293,7 +293,7 @@ isSQFileObject(sqInt objectPointer) { return (((isBytes(objectPointer)) - && ((byteSizeOf(objectPointer)) == (fileRecordSize()))) + && ((byteSizeOf(objectPointer)) == (sizeof(SQFile)))) && ((getThisSessionID()) == (sessionIdentifierFromSqFile(arrayValueOf(objectPointer))))) && (isNonNullSQFile(objectPointer)); } @@ -517,14 +517,14 @@ sqFileOop = stackValue(0); if (!((((isBytes(sqFileOop)) - && ((byteSizeOf(sqFileOop)) == (fileRecordSize()))) + && ((byteSizeOf(sqFileOop)) == (sizeof(SQFile)))) && ((getThisSessionID()) == (sessionIdentifierFromSqFile(arrayValueOf(sqFileOop))))) && (isNonNullSQFile(sqFileOop)))) { return primitiveFail(); } /* begin fileDescriptorFrom: */ if (!((((isBytes(sqFileOop)) - && ((byteSizeOf(sqFileOop)) == (fileRecordSize()))) + && ((byteSizeOf(sqFileOop)) == (sizeof(SQFile)))) && ((getThisSessionID()) == (sessionIdentifierFromSqFile(arrayValueOf(sqFileOop))))) && (isNonNullSQFile(sqFileOop)))) { fileNo = -1; Modified: branches/Cog/nscogsrc/plugins/LargeIntegers/LargeIntegers.c =================================================================== --- branches/Cog/nscogsrc/plugins/LargeIntegers/LargeIntegers.c 2014-11-16 01:45:07 UTC (rev 3137) +++ branches/Cog/nscogsrc/plugins/LargeIntegers/LargeIntegers.c 2014-11-21 02:57:22 UTC (rev 3138) @@ -1,9 +1,9 @@ /* Automatically generated by - SmartSyntaxPluginCodeGenerator VMMaker.oscog-eem.796 uuid: 037e61a6-d81c-42e5-bbcb-62adbd938f38 + SmartSyntaxPluginCodeGenerator VMMaker.oscog-eem.948 uuid: 9323b2ad-f5cf-4aca-8f31-67eb5616ccca from - LargeIntegersPlugin VMMaker.oscog-eem.796 uuid: 037e61a6-d81c-42e5-bbcb-62adbd938f38 + LargeIntegersPlugin VMMaker.oscog-eem.948 uuid: 9323b2ad-f5cf-4aca-8f31-67eb5616ccca */ -static char __buildInfo[] = "LargeIntegersPlugin VMMaker.oscog-eem.796 uuid: 037e61a6-d81c-42e5-bbcb-62adbd938f38 " __DATE__ ; +static char __buildInfo[] = "LargeIntegersPlugin VMMaker.oscog-eem.948 uuid: 9323b2ad-f5cf-4aca-8f31-67eb5616ccca " __DATE__ ; @@ -175,9 +175,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "LargeIntegers v1.5 VMMaker.oscog-eem.796 (i)" + "LargeIntegers v1.5 VMMaker.oscog-eem.948 (i)" #else - "LargeIntegers v1.5 VMMaker.oscog-eem.796 (e)" + "LargeIntegers v1.5 VMMaker.oscog-eem.948 (e)" #endif ; static const int orOpIndex = 1; @@ -876,25 +876,69 @@ } -/* Answer the number of indexable fields of a CSmallInteger. This value is - the same as the largest legal subscript. */ +/* Answer the number of bytes required to represent the value of a + CSmallInteger. + */ static sqInt cDigitLengthOfCSI(sqInt csi) { - if ((csi < 256) - && (csi > -256)) { + if (csi >= 0) { + if (csi < 256) { + return 1; + } + if (csi < 65536) { + return 2; + } + if (csi < 0x1000000) { + return 3; + } + if (BytesPerOop == 4) { + return 4; + } + else { + if (csi < 0x100000000ULL) { + return 4; + } + if (csi < 0x10000000000ULL) { + return 5; + } + if (csi < 0x1000000000000ULL) { + return 6; + } + if (csi < 0x100000000000000ULL) { + return 7; + } + return 8; + } + } + if (csi > -256) { return 1; } - if ((csi < 65536) - && (csi > -65536)) { + if (csi > -65536) { return 2; } - if ((csi < 0x1000000) - && (csi > -16777216)) { + if (csi > -16777216) { return 3; } - return 4; + if (BytesPerOop == 4) { + return 4; + } + else { + if (csi > -4294967296) { + return 4; + } + if (csi > -1099511627776) { + return 5; + } + if (csi > -281474976710656) { + return 6; + } + if (csi > -72057594037927936) { + return 7; + } + return 8; + } } static unsigned char @@ -950,17 +994,14 @@ { if (ix < 1) { primitiveFail(); + return 0; } - if (ix > 4) { + if (ix > BytesPerOop) { return 0; } - if (csi < 0) { - ; - return (((usqInt) (0 - csi)) >> ((ix - 1) * 8)) & 0xFF; - } - else { - return (((usqInt) csi) >> ((ix - 1) * 8)) & 0xFF; - } + return (((usqInt) ((csi < 0 + ? 0 - csi + : csi))) >> ((ix - 1) * 8)) & 0xFF; } static sqInt @@ -1085,6 +1126,7 @@ static sqInt createLargeFromSmallInteger(sqInt anOop) { + sqInt byte; sqInt class; sqInt ix; unsigned char * pByte; @@ -1099,28 +1141,25 @@ else { class = classLargePositiveInteger(); } - /* begin cDigitLengthOfCSI: */ - if ((val < 256) - && (val > -256)) { - size = 1; - goto l1; - } - if ((val < 65536) - && (val > -65536)) { - size = 2; - goto l1; - } - if ((val < 0x1000000) - && (val > -16777216)) { - size = 3; - goto l1; - } - size = 4; -l1: /* end cDigitLengthOfCSI: */; + size = cDigitLengthOfCSI(val); res = instantiateClassindexableSize(class, size); pByte = firstIndexableField(res); for (ix = 1; ix <= size; ix += 1) { - pByte[ix - 1] = (cDigitOfCSIat(val, ix)); + /* begin cDigitOfCSI:at: */ + if (ix < 1) { + primitiveFail(); + byte = 0; + goto l1; + } + if (ix > BytesPerOop) { + byte = 0; + goto l1; + } + byte = (((usqInt) ((val < 0 + ? 0 - val + : val))) >> ((ix - 1) * 8)) & 0xFF; + l1: /* end cDigitOfCSI:at: */; + pByte[ix - 1] = byte; } return res; } @@ -1484,23 +1523,7 @@ pDiv = firstIndexableField(div); /* begin digitLength: */ if (isIntegerObject(div)) { - /* begin cDigitLengthOfCSI: */ - if (((integerValueOf(div)) < 256) - && ((integerValueOf(div)) > -256)) { - divLen = 1; - goto l1; - } - if (((integerValueOf(div)) < 65536) - && ((integerValueOf(div)) > -65536)) { - divLen = 2; - goto l1; - } - if (((integerValueOf(div)) < 0x1000000) - && ((integerValueOf(div)) > -16777216)) { - divLen = 3; - goto l1; - } - divLen = 4; + divLen = cDigitLengthOfCSI(integerValueOf(div)); goto l1; } else { @@ -1511,23 +1534,7 @@ pRem = firstIndexableField(rem); /* begin digitLength: */ if (isIntegerObject(rem)) { - /* begin cDigitLengthOfCSI: */ - if (((integerValueOf(rem)) < 256) - && ((integerValueOf(rem)) > -256)) { - remLen = 1; - goto l2; - } - if (((integerValueOf(rem)) < 65536) - && ((integerValueOf(rem)) > -65536)) { - remLen = 2; - goto l2; - } - if (((integerValueOf(rem)) < 0x1000000) - && ((integerValueOf(rem)) > -16777216)) { - remLen = 3; - goto l2; - } - remLen = 4; + remLen = cDigitLengthOfCSI(integerValueOf(rem)); goto l2; } else { @@ -1538,23 +1545,7 @@ pQuo = firstIndexableField(quo); /* begin digitLength: */ if (isIntegerObject(quo)) { - /* begin cDigitLengthOfCSI: */ - if (((integerValueOf(quo)) < 256) - && ((integerValueOf(quo)) > -256)) { - quoLen = 1; - goto l3; - } - if (((integerValueOf(quo)) < 65536) - && ((integerValueOf(quo)) > -65536)) { - quoLen = 2; - goto l3; - } - if (((integerValueOf(quo)) < 0x1000000) - && ((integerValueOf(quo)) > -16777216)) { - quoLen = 3; - goto l3; - } - quoLen = 4; + quoLen = cDigitLengthOfCSI(integerValueOf(quo)); goto l3; } else { @@ -1690,20 +1681,7 @@ digitLength(sqInt oop) { if (isIntegerObject(oop)) { - /* begin cDigitLengthOfCSI: */ - if (((integerValueOf(oop)) < 256) - && ((integerValueOf(oop)) > -256)) { - return 1; - } - if (((integerValueOf(oop)) < 65536) - && ((integerValueOf(oop)) > -65536)) { - return 2; - } - if (((integerValueOf(oop)) < 0x1000000) - && ((integerValueOf(oop)) > -16777216)) { - return 3; - } - return 4; + return cDigitLengthOfCSI(integerValueOf(oop)); } else { return slotSizeOf(oop); @@ -1934,7 +1912,17 @@ unsigned char *pointer; if (isIntegerObject(oop)) { - return cDigitOfCSIat(integerValueOf(oop), ix); + /* begin cDigitOfCSI:at: */ + if (ix < 1) { + primitiveFail(); + return 0; + } + if (ix > BytesPerOop) { + return 0; + } + return (((usqInt) (((integerValueOf(oop)) < 0 + ? 0 - (integerValueOf(oop)) + : integerValueOf(oop)))) >> ((ix - 1) * 8)) & 0xFF; } else { /* begin digitOfBytes:at: */ @@ -2110,23 +2098,7 @@ } /* begin digitLength: */ if (isIntegerObject(anInteger)) { - /* begin cDigitLengthOfCSI: */ - if (((integerValueOf(anInteger)) < 256) - && ((integerValueOf(anInteger)) > -256)) { - len = 1; - goto l1; - } - if (((integerValueOf(anInteger)) < 65536) - && ((integerValueOf(anInteger)) > -65536)) { - len = 2; - goto l1; - } - if (((integerValueOf(anInteger)) < 0x1000000) - && ((integerValueOf(anInteger)) > -16777216)) { - len = 3; - goto l1; - } - len = 4; + len = cDigitLengthOfCSI(integerValueOf(anInteger)); goto l1; } else { @@ -2143,7 +2115,7 @@ /* maximal digitLength of aSmallInteger */ - sLen = 4; + sLen = BytesPerOop; if (len > sLen) { return 1; } @@ -2155,7 +2127,7 @@ /* SmallInteger maxVal */ /* all bytes of maxVal but the highest one are just FF's */ - maxVal = 0x3FFFFFFF; + maxVal = MaxSmallInteger; return (((pointer1 = firstIndexableField(anInteger)))[sLen - 1]) > (cDigitOfCSIat(maxVal, sLen)); } else { @@ -2163,7 +2135,7 @@ /* SmallInteger minVal */ /* all bytes of minVal but the highest one are just 00's */ - minVal = -1073741824; + minVal = MinSmallInteger; if ((((pointer2 = firstIndexableField(anInteger)))[sLen - 1]) < (cDigitOfCSIat(minVal, sLen))) { return 0; } @@ -2221,7 +2193,7 @@ /* SmallInteger minVal */ - minVal = -1073741824; + minVal = MinSmallInteger; if ((len < sLen) || ((digitOfBytesat(aLargeNegativeInteger, sLen)) < (cDigitOfCSIat(minVal, sLen)))) { @@ -2292,9 +2264,9 @@ /* SmallInteger maxVal digitLength. */ - sLen = 4; + sLen = BytesPerOop; if ((len <= sLen) - && ((digitOfBytesat(aLargePositiveInteger, sLen)) <= (cDigitOfCSIat(0x3FFFFFFF, sLen)))) { + && ((digitOfBytesat(aLargePositiveInteger, sLen)) <= (cDigitOfCSIat(MaxSmallInteger, sLen)))) { /* If so, return its SmallInt value */ Modified: branches/Cog/nscogsrc/plugins/Matrix2x3Plugin/Matrix2x3Plugin.c =================================================================== --- branches/Cog/nscogsrc/plugins/Matrix2x3Plugin/Matrix2x3Plugin.c 2014-11-16 01:45:07 UTC (rev 3137) +++ branches/Cog/nscogsrc/plugins/Matrix2x3Plugin/Matrix2x3Plugin.c 2014-11-21 02:57:22 UTC (rev 3138) @@ -1,9 +1,9 @@ /* Automatically generated by - VMPluginCodeGenerator VMMaker.oscog-eem.580 uuid: 751b08d4-d92e-440a-b3f6-cb2c76f52514 + VMPluginCodeGenerator VMMaker.oscog-eem.948 uuid: 9323b2ad-f5cf-4aca-8f31-67eb5616ccca from - Matrix2x3Plugin VMMaker.oscog-eem.580 uuid: 751b08d4-d92e-440a-b3f6-cb2c76f52514 + Matrix2x3Plugin VMMaker.oscog-eem.948 uuid: 9323b2ad-f5cf-4aca-8f31-67eb5616ccca */ -static char __buildInfo[] = "Matrix2x3Plugin VMMaker.oscog-eem.580 uuid: 751b08d4-d92e-440a-b3f6-cb2c76f52514 " __DATE__ ; +static char __buildInfo[] = "Matrix2x3Plugin VMMaker.oscog-eem.948 uuid: 9323b2ad-f5cf-4aca-8f31-67eb5616ccca " __DATE__ ; @@ -117,9 +117,9 @@ static double m23ResultY; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "Matrix2x3Plugin VMMaker.oscog-eem.580 (i)" + "Matrix2x3Plugin VMMaker.oscog-eem.948 (i)" #else - "Matrix2x3Plugin VMMaker.oscog-eem.580 (e)" + "Matrix2x3Plugin VMMaker.oscog-eem.948 (e)" #endif ; @@ -282,8 +282,8 @@ static sqInt okayIntValue(sqInt value) { - return (value >= (((double) -1073741824 ))) - && (m23ResultX <= (((double) 0x3FFFFFFF ))); + return (value >= (((double) (MinSmallInteger) ))) + && (m23ResultX <= (((double) (MaxSmallInteger) ))); } EXPORT(sqInt) @@ -394,13 +394,13 @@ /* begin roundAndStoreResultPoint: */ m23ResultX += 0.5; m23ResultY += 0.5; - if (!((m23ResultX >= (((double) -1073741824 ))) - && (m23ResultX <= (((double) 0x3FFFFFFF ))))) { + if (!((m23ResultX >= (((double) (MinSmallInteger) ))) + && (m23ResultX <= (((double) (MaxSmallInteger) ))))) { primitiveFail(); goto l2; } - if (!((m23ResultY >= (((double) -1073741824 ))) - && (m23ResultX <= (((double) 0x3FFFFFFF ))))) { + if (!((m23ResultY >= (((double) (MinSmallInteger) ))) + && (m23ResultX <= (((double) (MaxSmallInteger) ))))) { primitiveFail(); goto l2; } @@ -588,13 +588,13 @@ /* begin roundAndStoreResultPoint: */ m23ResultX += 0.5; m23ResultY += 0.5; - if (!((m23ResultX >= (((double) -1073741824 ))) - && (m23ResultX <= (((double) 0x3FFFFFFF ))))) { + if (!((m23ResultX >= (((double) (MinSmallInteger) ))) + && (m23ResultX <= (((double) (MaxSmallInteger) ))))) { primitiveFail(); goto l2; } - if (!((m23ResultY >= (((double) -1073741824 ))) - && (m23ResultX <= (((double) 0x3FFFFFFF ))))) { + if (!((m23ResultY >= (((double) (MinSmallInteger) ))) + && (m23ResultX <= (((double) (MaxSmallInteger) ))))) { primitiveFail(); goto l2; } @@ -712,12 +712,12 @@ { m23ResultX += 0.5; m23ResultY += 0.5; - if (!((m23ResultX >= (((double) -1073741824 ))) - && (m23ResultX <= (((double) 0x3FFFFFFF ))))) { + if (!((m23ResultX >= (((double) (MinSmallInteger) ))) + && (m23ResultX <= (((double) (MaxSmallInteger) ))))) { return primitiveFail(); } - if (!((m23ResultY >= (((double) -1073741824 ))) - && (m23ResultX <= (((double) 0x3FFFFFFF ))))) { + if (!((m23ResultY >= (((double) (MinSmallInteger) ))) + && (m23ResultX <= (((double) (MaxSmallInteger) ))))) { return primitiveFail(); } popthenPush(nItemsToPop, makePointwithxValueyValue(((sqInt)m23ResultX), ((sqInt)m23ResultY))); @@ -738,23 +738,23 @@ sqInt rectOop; minX = x0 + 0.5; - if (!((minX >= (((double) -1073741824 ))) - && (m23ResultX <= (((double) 0x3FFFFFFF ))))) { + if (!((minX >= (((double) (MinSmallInteger) ))) + && (m23ResultX <= (((double) (MaxSmallInteger) ))))) { return primitiveFail(); } maxX = x1 + 0.5; - if (!((maxX >= (((double) -1073741824 ))) - && (m23ResultX <= (((double) 0x3FFFFFFF ))))) { + if (!((maxX >= (((double) (MinSmallInteger) ))) + && (m23ResultX <= (((double) (MaxSmallInteger) ))))) { return primitiveFail(); } minY = y0 + 0.5; - if (!((minY >= (((double) -1073741824 ))) - && (m23ResultX <= (((double) 0x3FFFFFFF ))))) { + if (!((minY >= (((double) (MinSmallInteger) ))) + && (m23ResultX <= (((double) (MaxSmallInteger) ))))) { return primitiveFail(); } maxY = y1 + 0.5; - if (!((maxY >= (((double) -1073741824 ))) - && (m23ResultX <= (((double) 0x3FFFFFFF ))))) { + if (!((maxY >= (((double) (MinSmallInteger) ))) + && (m23ResultX <= (((double) (MaxSmallInteger) ))))) { return primitiveFail(); } pushRemappableOop(dstOop); Modified: branches/Cog/nscogsrc/plugins/UnixOSProcessPlugin/UnixOSProcessPlugin.c =================================================================== --- branches/Cog/nscogsrc/plugins/UnixOSProcessPlugin/UnixOSProcessPlugin.c 2014-11-16 01:45:07 UTC (rev 3137) +++ branches/Cog/nscogsrc/plugins/UnixOSProcessPlugin/UnixOSProcessPlugin.c 2014-11-21 02:57:22 UTC (rev 3138) @@ -1,9 +1,9 @@ /* Automatically generated by - VMPluginCodeGenerator VMMaker.oscog-eem.706 uuid: 6eba60e7-a131-4353-870a-b34e8230b701 + VMPluginCodeGenerator VMMaker.oscog-eem.948 uuid: 9323b2ad-f5cf-4aca-8f31-67eb5616ccca from - UnixOSProcessPlugin VMConstruction-Plugins-OSProcessPlugin.oscog-eem.48 uuid: 65e92aef-c30a-4a73-8966-e3d7da6ec7b6 + UnixOSProcessPlugin VMConstruction-Plugins-OSProcessPlugin.oscog-eem.49 uuid: dbbde2e2-9103-4ba8-96a9-33c29e7ee7e4 */ -static char __buildInfo[] = "UnixOSProcessPlugin VMConstruction-Plugins-OSProcessPlugin.oscog-eem.48 uuid: 65e92aef-c30a-4a73-8966-e3d7da6ec7b6 " __DATE__ ; +static char __buildInfo[] = "UnixOSProcessPlugin VMConstruction-Plugins-OSProcessPlugin.oscog-eem.49 uuid: dbbde2e2-9103-4ba8-96a9-33c29e7ee7e4 " __DATE__ ; /* D T Lewis - UnixOSProcessPlugin.c translated from class UnixOSProcessPlugin of OSProcessPlugin version 4.3.3 Cog */ @@ -318,9 +318,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "UnixOSProcessPlugin VMConstruction-Plugins-OSProcessPlugin.oscog-eem.48 (i)" + "UnixOSProcessPlugin VMConstruction-Plugins-OSProcessPlugin.oscog-eem.49 (i)" #else - "UnixOSProcessPlugin VMConstruction-Plugins-OSProcessPlugin.oscog-eem.48 (e)" + "UnixOSProcessPlugin VMConstruction-Plugins-OSProcessPlugin.oscog-eem.49 (e)" #endif ; static void *originalSigHandlers[NSIG]; @@ -1271,7 +1271,7 @@ # endif /* defined(SA_DISABLE) */ - SigStackSize = ((((1024 * (sizeof(void *))) * 16) < (MINSIGSTKSZ)) ? (MINSIGSTKSZ) : ((1024 * (sizeof(void *))) * 16)); + SigStackSize = ((((1024 * (sizeof(void *))) * 16) < MINSIGSTKSZ) ? MINSIGSTKSZ : ((1024 * (sizeof(void *))) * 16)); if (null == (sigstack.ss_size = SigStackSize, sigstack.ss_sp = malloc(SigStackSize))) { msg("sigstack malloc failed"); useSignalStack = 0; Modified: branches/Cog/nscogsrc/vm/cointerp.c =================================================================== --- branches/Cog/nscogsrc/vm/cointerp.c 2014-11-16 01:45:07 UTC (rev 3137) +++ branches/Cog/nscogsrc/vm/cointerp.c 2014-11-21 02:57:22 UTC (rev 3138) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.933 uuid: 5a37067c-b76b-4ada-9399-1de11632acd8 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.948 uuid: 9323b2ad-f5cf-4aca-8f31-67eb5616ccca from - CoInterpreter VMMaker.oscog-eem.933 uuid: 5a37067c-b76b-4ada-9399-1de11632acd8 + CoInterpreter VMMaker.oscog-eem.948 uuid: 9323b2ad-f5cf-4aca-8f31-67eb5616ccca */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.933 uuid: 5a37067c-b76b-4ada-9399-1de11632acd8 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.948 uuid: 9323b2ad-f5cf-4aca-8f31-67eb5616ccca " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -101,6 +101,7 @@ #define AllButMarkBitAndTypeMask 0x7FFFFFFC #define AllButRootBit 0xBFFFFFFFUL #define AllButTypeMask 0xFFFFFFFCUL +#define AlternateHeaderHasPrimFlag 0x20000 #define AltLongStoreBytecode 234 #define AtCacheFixedFields 4 #define AtCacheFmt 3 @@ -259,6 +260,8 @@ #define MethodCacheSelector 1 #define MethodCacheSize 4096 #define MethodDictionaryIndex 1 +#define MethodHeaderArgCountShift 25 +#define MethodHeaderTempCountShift 19 #define MethodIndex 3 #define MFMethodFlagHasContextFlag 1 #define MFMethodFlagIsBlockFlag 2 @@ -320,7 +323,6 @@ #define Size4Bit 0 #define SizeMask 0xFC #define SmallContextSlots 22 -#define SmallIntegerShift 1 #define SpecialSelectors 23 #define StackPageReachedButUntraced 1 #define StackPageTraced 2 @@ -352,6 +354,7 @@ #define TrueObject 2 #define TypeMask 0x3 #define Upward 3 +#define V3PrimitiveBitsMask 0x200003FE #define ValueIndex 1 #define WeakRootTableSize 2625 #define WordMask 0xFFFFFFFFUL @@ -585,6 +588,7 @@ static sqInt pageListIsWellFormed(void); static StackPage * stackPageAt(sqInt index) NoDbgRegParms; static StackPage * stackPageFor(void *pointer) NoDbgRegParms; +static unsigned long asUnsigned(sqInt anInteger) NoDbgRegParms; char * cStringOrNullFor(sqInt oop); sqInt failed(void); static sqInt isNegativeIntegerValueOf(sqInt oop) NoDbgRegParms; @@ -850,7 +854,7 @@ void printWronglySizedContexts(sqInt printContexts); static void restoreHeadersFromtofromandtofrom(sqInt firstIn, sqInt lastIn, sqInt hdrBaseIn, sqInt firstOut, sqInt lastOut, sqInt hdrBaseOut) NoDbgRegParms; static void runLeakCheckerForFullGC(sqInt fullGCFlag) NoDbgRegParms; -static usqInt safeObjectAfter(sqInt oop) NoDbgRegParms; +static sqInt safeObjectAfter(sqInt oop) NoDbgRegParms; static sqInt safePrintStringOf(sqInt oop) NoDbgRegParms; static sqInt shortentoIndexableSize(sqInt obj, sqInt nSlots) NoDbgRegParms; static sqInt sizeBitsOfSafe(sqInt oop) NoDbgRegParms; @@ -1027,7 +1031,7 @@ static sqInt checkDeliveryOfLongRunningPrimitiveSignal(void); sqInt checkedIntegerValueOf(sqInt intOop); static sqInt checkForEventsMayContextSwitch(sqInt mayContextSwitch) NoDbgRegParms; -static sqInt checkImageVersionFromstartingAt(sqImageFile f, squeakFileOffsetType imageOffset) NoDbgRegParms; +static sqInt checkImageVersionFromstartingAt(sqImageFile f, squeakFileOffsetType imageOffset) NoDbgRegParms; static sqInt checkInterpreterIntegrity(void); static sqInt checkIsStillMarriedContextcurrentFP(sqInt aContext, char *currentFP) NoDbgRegParms; sqInt checkOkayInterpreterObjects(sqInt writeBack); @@ -1095,12 +1099,12 @@ sqInt getFullScreenFlag(void); sqInt getInterruptKeycode(void); sqInt getInterruptPending(void); -static sqInt getLongFromFileswap(sqImageFile aFile, sqInt swapFlag) NoDbgRegParms; usqLong getNextWakeupUsecs(void); sqInt getSavedWindowSize(void); static sqInt getShortFromFileswap(sqImageFile aFile, sqInt swapFlag) NoDbgRegParms; sqInt * getStackPointer(void); sqInt getThisSessionID(void); +static sqInt getWord32FromFileswap(sqImageFile aFile, sqInt swapFlag) NoDbgRegParms; static void handleStackOverflow(void); static sqInt handleStackOverflowOrEventAllowContextSwitch(sqInt mayContextSwitch) NoDbgRegParms; sqInt headerIndicatesAlternateBytecodeSet(sqInt methodHeader); @@ -1214,9 +1218,10 @@ void pushFloat(double f); sqInt pushInteger(sqInt integerValue); void push(sqInt object); -static void putLongtoFile(sqInt aWord, sqImageFile aFile) NoDbgRegParms; -static void putShorttoFile(sqInt aShort, sqImageFile aFile) NoDbgRegParms; +static void putLongtoFile(long aLong, sqImageFile aFile) NoDbgRegParms; +static void putShorttoFile(short aShort, sqImageFile aFile) NoDbgRegParms; static void putToSleepyieldingIf(sqInt aProcess, sqInt yieldImplicitly) NoDbgRegParms; +static void putWord32toFile(int aWord32, sqImageFile aFile) NoDbgRegParms; static sqInt quickFetchIntegerofObject(sqInt fieldIndex, sqInt objectPointer) NoDbgRegParms; sqInt readableFormat(sqInt imageVersion); EXPORT(sqInt) reestablishContextPriorToCallback(sqInt callbackContext); @@ -1301,6 +1306,8 @@ EXPORT(void) primitiveSetGCSemaphore(void); static void primitiveSignalAtMilliseconds(void); static void primitiveSignalAtUTCMicroseconds(void); +static void primitiveSlotAt(void); +static void primitiveSlotAtPut(void); static void primitiveStoreStackp(void); static void primitiveVMParameter(void); EXPORT(void) primitiveVoidReceiver(void); @@ -1682,8 +1689,8 @@ /* 170 */ primitiveAsCharacter, /* 171 */ primitiveCharacterValue, /* 172 */ (void (*)(void))0, - /* 173 */ (void (*)(void))0, - /* 174 */ (void (*)(void))0, + /* 173 */ primitiveSlotAt, + /* 174 */ primitiveSlotAtPut, /* 175 */ primitiveBehaviorHash, /* 176 */ primitiveMaxIdentityHash, /* 177 */ primitiveAllInstances, @@ -2086,7 +2093,7 @@ /* 574 */ (void (*)(void))0, /* 575 */ (void (*)(void))0, 0 }; -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.933"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.948"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -4823,7 +4830,6 @@ GIV(framePointer) = localFP; ceEnterCogCodePopReceiverReg(); - null; goto l260; } localIP = pointerForOop(longAt(localFP + FoxIFSavedIP)); @@ -4841,7 +4847,7 @@ /* begin fetchNextBytecode */ currentBytecode = (byteAtPointer(++localIP)) + GIV(bytecodeSetSelector); - null; + /* return self */ l260: /* end baseFrameReturn */; goto l259; } @@ -5367,7 +5373,8 @@ /* begin internalActivateNewMethod */ methodHeader = longAt((GIV(newMethod) + BaseHeaderSize) + (HeaderIndex << (shiftForWord()))); assert(!(isCogMethodReference(methodHeader))); - numTemps = (((usqInt) methodHeader) >> 19) & 0x3F; + numTemps = (((usqInt) methodHeader) >> MethodHeaderTempCountShift) & 0x3F; + assert(GIV(argumentCount) == (argumentCountOfMethodHeader(methodHeader))); /* could new rcvr be set at point of send? */ @@ -5392,8 +5399,8 @@ longAtPointerput((localSP -= BytesPerOop), GIV(nilObj)); /* begin internalPush: */ object = (VMBIGENDIAN - ? ((1 + (((((usqInt) methodHeader) >> 25) & 15) << ((BytesPerWord * 8) - 8))) + (0)) + (0) - : ((1 + (((((usqInt) methodHeader) >> 25) & 15) << 8)) + (0)) + (0)); + ? ((1 + (((((usqInt) methodHeader) >> MethodHeaderArgCountShift) & 15) << ((BytesPerWord * 8) - 8))) + (0)) + (0) + : ((1 + (((((usqInt) methodHeader) >> MethodHeaderArgCountShift) & 15) << 8)) + (0)) + (0)); longAtPointerput((localSP -= BytesPerOop), object); /* begin internalPush: */ longAtPointerput((localSP -= BytesPerOop), 0); @@ -5405,8 +5412,8 @@ } localIP = pointerForOop(((GIV(newMethod) + ((LiteralStart + (literalCountOfMethodHeader(methodHeader))) * BytesPerOop)) + BaseHeaderSize) - 1); if (((((sqInt) methodHeader)) < 0 - ? methodHeader & (65536 << SmallIntegerShift) - : (methodHeader & 536871934) != 0)) { + ? methodHeader & AlternateHeaderHasPrimFlag + : methodHeader & V3PrimitiveBitsMask)) { /* Skip the CallPrimitive bytecode, if it's there, and store the error code if the method starts with a long store temp. Strictly no need to skip the store because it's effectively a noop. */ @@ -7924,14 +7931,9 @@ /* bytecodePrimBitShift */ { sqInt integerArgument; - sqInt integerPointer; - usqInt integerReceiver; - sqInt object; + sqLong integerReceiver; sqInt shifted; char *sp; - sqInt top; - sqInt top1; - sqInt top2; VM_LABEL(bytecodePrimBitShift); /* begin initPrimCall */ @@ -7942,82 +7944,63 @@ GIV(stackPointer) = localSP; GIV(framePointer) = localFP; /* begin primitiveBitShift */ - /* begin popInteger */ - /* begin popStack */ - top2 = longAt(GIV(stackPointer)); - GIV(stackPointer) += BytesPerWord; - integerPointer = top2; - /* begin checkedIntegerValueOf: */ - if ((integerPointer & 1)) { - integerArgument = (integerPointer >> 1); - goto l88; - } - else { + integerArgument = longAt(GIV(stackPointer)); + if (!((integerArgument & 1))) { /* begin primitiveFail */ if (!GIV(primFailCode)) { GIV(primFailCode) = 1; } - integerArgument = 0; + null; goto l88; } - l88: /* end popInteger */; - /* begin popPos32BitInteger */ - /* begin popStack */ - top1 = longAt(GIV(stackPointer)); - GIV(stackPointer) += BytesPerWord; - top = top1; - integerReceiver = positive32BitValueOf(top); + integerReceiver = longAt(GIV(stackPointer) + (1 * BytesPerWord)); + integerReceiver = positive32BitValueOf(integerReceiver); + if (!GIV(primFailCode)) { - if (integerArgument >= 0) { + if (((integerArgument = (integerArgument >> 1))) >= 0) { /* Left shift -- must fail if we lose bits beyond 32 */ - /* begin success: */ if (!(integerArgument <= 0x1F)) { - - /* Don't overwrite an error code that has already been set. */ - + /* begin primitiveFail */ if (!GIV(primFailCode)) { GIV(primFailCode) = 1; } + null; + goto l88; } shifted = integerReceiver << integerArgument; - /* begin success: */ if (!((((usqInt) shifted) >> integerArgument) == integerReceiver)) { - - /* Don't overwrite an error code that has already been set. */ - + /* begin primitiveFail */ if (!GIV(primFailCode)) { GIV(primFailCode) = 1; } + null; + goto l88; } } else { /* Right shift -- OK to lose bits */ - /* begin success: */ - if (!(integerArgument >= -31)) { - - /* Don't overwrite an error code that has already been set. */ - + if (!(integerArgument >= (-0x1F))) { + /* begin primitiveFail */ if (!GIV(primFailCode)) { GIV(primFailCode) = 1; } + null; + goto l88; } - shifted = ((usqInt) integerReceiver) >> (0 - integerArgument); + shifted = ((unsigned sqLong)integerReceiver) >> (0 - integerArgument); } - } - if (!GIV(primFailCode)) { - /* begin push: */ - object = positive32BitIntegerFor(shifted); - longAtput((sp = GIV(stackPointer) - BytesPerWord), object); + shifted = ((shifted ^ (shifted << 1)) >= 0 + ? ((shifted << 1) | 1) + : positive32BitIntegerFor(shifted)); + /* begin pop:thenPush: */ + longAtput((sp = GIV(stackPointer) + ((2 - 1) * BytesPerWord)), shifted); GIV(stackPointer) = sp; } - else { - /* begin unPop: */ - GIV(stackPointer) -= 2 * BytesPerWord; - } + l88: /* end primitiveBitShift */; /* begin internalizeIPandSP */ assert(GIV(instructionPointer) != (ceReturnToInterpreterPC())); localIP = pointerForOop(GIV(instructionPointer)); @@ -10885,14 +10868,9 @@ /* bytecodePrimBitShift */ { sqInt integerArgument; - sqInt integerPointer; - usqInt integerReceiver; - sqInt object; + sqLong integerReceiver; sqInt shifted; char *sp; - sqInt top; - sqInt top1; - sqInt top2; VM_LABEL(bytecodePrimBitShift1); /* begin initPrimCall */ @@ -10903,82 +10881,63 @@ GIV(stackPointer) = localSP; GIV(framePointer) = localFP; /* begin primitiveBitShift */ - /* begin popInteger */ - /* begin popStack */ - top2 = longAt(GIV(stackPointer)); - GIV(stackPointer) += BytesPerWord; - integerPointer = top2; - /* begin checkedIntegerValueOf: */ - if ((integerPointer & 1)) { - integerArgument = (integerPointer >> 1); - goto l203; - } - else { + integerArgument = longAt(GIV(stackPointer)); + if (!((integerArgument & 1))) { /* begin primitiveFail */ if (!GIV(primFailCode)) { GIV(primFailCode) = 1; } - integerArgument = 0; + null; goto l203; } - l203: /* end popInteger */; - /* begin popPos32BitInteger */ - /* begin popStack */ - top1 = longAt(GIV(stackPointer)); - GIV(stackPointer) += BytesPerWord; - top = top1; - integerReceiver = positive32BitValueOf(top); + integerReceiver = longAt(GIV(stackPointer) + (1 * BytesPerWord)); + integerReceiver = positive32BitValueOf(integerReceiver); + if (!GIV(primFailCode)) { - if (integerArgument >= 0) { + if (((integerArgument = (integerArgument >> 1))) >= 0) { /* Left shift -- must fail if we lose bits beyond 32 */ - /* begin success: */ if (!(integerArgument <= 0x1F)) { - - /* Don't overwrite an error code that has already been set. */ - + /* begin primitiveFail */ if (!GIV(primFailCode)) { GIV(primFailCode) = 1; } + null; + goto l203; } shifted = integerReceiver << integerArgument; - /* begin success: */ if (!((((usqInt) shifted) >> integerArgument) == integerReceiver)) { - - /* Don't overwrite an error code that has already been set. */ - + /* begin primitiveFail */ if (!GIV(primFailCode)) { GIV(primFailCode) = 1; } + null; + goto l203; } } else { /* Right shift -- OK to lose bits */ - /* begin success: */ - if (!(integerArgument >= -31)) { - - /* Don't overwrite an error code that has already been set. */ - + if (!(integerArgument >= (-0x1F))) { + /* begin primitiveFail */ if (!GIV(primFailCode)) { GIV(primFailCode) = 1; } + null; + goto l203; } - shifted = ((usqInt) integerReceiver) >> (0 - integerArgument); + shifted = ((unsigned sqLong)integerReceiver) >> (0 - integerArgument); } - } - if (!GIV(primFailCode)) { - /* begin push: */ - object = positive32BitIntegerFor(shifted); - longAtput((sp = GIV(stackPointer) - BytesPerWord), object); + shifted = ((shifted ^ (shifted << 1)) >= 0 + ? ((shifted << 1) | 1) + : positive32BitIntegerFor(shifted)); + /* begin pop:thenPush: */ + longAtput((sp = GIV(stackPointer) + ((2 - 1) * BytesPerWord)), shifted); GIV(stackPointer) = sp; } - else { - /* begin unPop: */ - GIV(stackPointer) -= 2 * BytesPerWord; - } + l203: /* end primitiveBitShift */; /* begin internalizeIPandSP */ assert(GIV(instructionPointer) != (ceReturnToInterpreterPC())); localIP = pointerForOop(GIV(instructionPointer)); @@ -12999,8 +12958,8 @@ assert((((((CogMethod *) header2))->objectHeader)) == (nullHeaderForMachineCodeMethod())), ((((CogMethod *) header2))->methodHeader))); if ((((((sqInt) header)) < 0 - ? header & (65536 << SmallIntegerShift) - : (header & 536871934) != 0)) + ? header & AlternateHeaderHasPrimFlag + : header & V3PrimitiveBitsMask)) && ((((sqInt)localIP)) == ((GIV(method) + ((LiteralStart + (literalCountOfMethodHeader(header))) * BytesPerOop)) + BaseHeaderSize))) { localIP = (localIP + (((((sqInt) header)) < 0 ? 3 @@ -13181,15 +13140,15 @@ /* begin push: */ longAtput((sp9 = GIV(stackPointer) - BytesPerWord), rcvr); GIV(stackPointer) = sp9; - numTemps = (((usqInt) methodHeader) >> 19) & 0x3F; + numTemps = (((usqInt) methodHeader) >> MethodHeaderTempCountShift) & 0x3F; for (i = (((cogMethod->cmNumArgs)) + 1); i <= numTemps; i += 1) { /* begin push: */ longAtput((sp2 = GIV(stackPointer) - BytesPerWord), GIV(nilObj)); GIV(stackPointer) = sp2; } if (((((sqInt) methodHeader)) < 0 - ? methodHeader & (65536 << SmallIntegerShift) - : (methodHeader & 536871934) != 0)) { + ? methodHeader & AlternateHeaderHasPrimFlag + : methodHeader & V3PrimitiveBitsMask)) { /* Store the error code if the method starts with a long store temp. No instructionPointer skip because we're heading for machine code. */ @@ -13263,8 +13222,8 @@ : (assert((((usqInt)header)) < (heapBase())), assert((((((CogMethod *) header))->objectHeader)) == (nullHeaderForMachineCodeMethod())), ((((CogMethod *) header))->methodHeader))); - numTemps = (((usqInt) methodHeader) >> 19) & 0x3F; - numArgs = (((usqInt) methodHeader) >> 25) & 15; + numTemps = (((usqInt) methodHeader) >> MethodHeaderTempCountShift) & 0x3F; + numArgs = (((usqInt) methodHeader) >> MethodHeaderArgCountShift) & 15; /* could new rcvr be set at point of send? */ @@ -13315,8 +13274,8 @@ } GIV(instructionPointer) = ((GIV(newMethod) + ((LiteralStart + (literalCountOfMethodHeader(methodHeader))) * BytesPerOop)) + BaseHeaderSize) - 1; if (((((sqInt) methodHeader)) < 0 - ? methodHeader & (65536 << SmallIntegerShift) - : (methodHeader & 536871934) != 0)) { + ? methodHeader & AlternateHeaderHasPrimFlag + : methodHeader & V3PrimitiveBitsMask)) { /* Skip the CallPrimitive bytecode, if it's there, and store the error code if the method starts with a long store temp. Strictly no need to skip the store because it's effectively a noop. */ @@ -13397,8 +13356,8 @@ assert((((((CogMethod *) header))->objectHeader)) == (nullHeaderForMachineCodeMethod())), ((((CogMethod *) header))->methodHeader))); primitiveIndex = ((((sqInt) methodHeader)) < 0 - ? (methodHeader & (65536 << SmallIntegerShift) - ? ((firstBytecode = (GIV(newMethod) + ((LiteralStart + ((((usqInt) methodHeader) >> 1) & 0xFFFF)) * BytesPerOop)) + BaseHeaderSize), + ? (methodHeader & AlternateHeaderHasPrimFlag + ? ((firstBytecode = (GIV(newMethod) + ((LiteralStart + (((methodHeader >> 1)) & 0xFFFF)) * BytesPerOop)) + BaseHeaderSize), (byteAt(firstBytecode + 1)) + ((byteAt(firstBytecode + 2)) << 8)) : 0) : ((primBits = (methodHeader >> 1)), @@ -13799,7 +13758,7 @@ : (assert((((usqInt)header1)) < (heapBase())), assert((((((CogMethod *) header1))->objectHeader)) == (nullHeaderForMachineCodeMethod())), ((((CogMethod *) header1))->methodHeader))); - GIV(argumentCount) = (((usqInt) header) >> 25) & 15; + GIV(argumentCount) = (((usqInt) header) >> MethodHeaderArgCountShift) & 15; assert(wasInMachineCode == (isMachineCodeFrame(GIV(framePointer)))); if (calledFromMachineCode) { if ((((usqInt)GIV(instructionPointer))) >= (startOfMemory())) { @@ -14367,8 +14326,8 @@ assert((((((CogMethod *) header))->objectHeader)) == (nullHeaderForMachineCodeMethod())), ((((CogMethod *) header))->methodHeader))); primitiveIndex = ((((sqInt) methodHeader)) < 0 - ? (methodHeader & (65536 << SmallIntegerShift) - ? ((firstBytecode = (aMethodObj + ((LiteralStart + ((((usqInt) methodHeader) >> 1) & 0xFFFF)) * BytesPerOop)) + BaseHeaderSize), + ? (methodHeader & AlternateHeaderHasPrimFlag + ? ((firstBytecode = (aMethodObj + ((LiteralStart + (((methodHeader >> 1)) & 0xFFFF)) * BytesPerOop)) + BaseHeaderSize), (byteAt(firstBytecode + 1)) + ((byteAt(firstBytecode + 2)) << 8)) : 0) : ((primBits = (methodHeader >> 1)), @@ -14439,8 +14398,8 @@ assert((((((CogMethod *) header))->objectHeader)) == (nullHeaderForMachineCodeMethod())), ((((CogMethod *) header))->methodHeader))); primitiveIndex = ((((sqInt) methodHeader)) < 0 - ? (methodHeader & (65536 << SmallIntegerShift) - ? ((firstBytecode = (aMethodObj + ((LiteralStart + ((((usqInt) methodHeader) >> 1) & 0xFFFF)) * BytesPerOop)) + BaseHeaderSize), + ? (methodHeader & AlternateHeaderHasPrimFlag + ? ((firstBytecode = (aMethodObj + ((LiteralStart + (((methodHeader >> 1)) & 0xFFFF)) * BytesPerOop)) + BaseHeaderSize), (byteAt(firstBytecode + 1)) + ((byteAt(firstBytecode + 2)) << 8)) : 0) : ((primBits = (methodHeader >> 1)), @@ -17217,11 +17176,11 @@ /* If this is a synthetic context its IP could be pointing at the CallPrimitive opcode. If so, skip it. */ - numArgs = (((usqInt) header) >> 25) & 15; + numArgs = (((usqInt) header) >> MethodHeaderArgCountShift) & 15; if (((((sqInt) theIP)) > 0) && ((((((sqInt) header)) < 0 - ? header & (65536 << SmallIntegerShift) - : (header & 536871934) != 0)) + ? header & AlternateHeaderHasPrimFlag + : header & V3PrimitiveBitsMask)) && (theIP == (1 + (lastPointerOf(theMethod)))))) { theIP += ((((sqInt) header)) < 0 ? 3 @@ -18416,8 +18375,8 @@ theMethod = (cogMethod->methodObject); methodHeader = (cogMethod->methodHeader); primitive = ((((sqInt) methodHeader)) < 0 - ? (methodHeader & (65536 << SmallIntegerShift) - ? ((firstBytecode = (theMethod + ((LiteralStart + ((((usqInt) methodHeader) >> 1) & 0xFFFF)) * BytesPerOop)) + BaseHeaderSize), + ? (methodHeader & AlternateHeaderHasPrimFlag + ? ((firstBytecode = (theMethod + ((LiteralStart + (((methodHeader >> 1)) & 0xFFFF)) * BytesPerOop)) + BaseHeaderSize), (byteAt(firstBytecode + 1)) + ((byteAt(firstBytecode + 2)) << 8)) : 0) : ((primBits = (methodHeader >> 1)), @@ -18744,7 +18703,7 @@ numArgs = (cogMethod->cmNumArgs); /* begin temporaryCountOfMethodHeader: */ header = (homeMethod->methodHeader); - numTemps = (((usqInt) header) >> 19) & 0x3F; + numTemps = (((usqInt) header) >> MethodHeaderTempCountShift) & 0x3F; } else { theMethod = ((((usqInt)(longAt(theFP + FoxMethod)))) < (startOfMemory()) @@ -18761,7 +18720,7 @@ : (assert((((usqInt)header2)) < (heapBase())), assert((((((CogMethod *) header2))->objectHeader)) == (nullHeaderForMachineCodeMethod())), ((((CogMethod *) header2))->methodHeader))); - numTemps = (((usqInt) header1) >> 19) & 0x3F; + numTemps = (((usqInt) header1) >> MethodHeaderTempCountShift) & 0x3F; } if (((((usqInt)(longAt(theFP + FoxMethod)))) < (startOfMemory()) ? ((longAt(theFP + FoxMethod)) & MFMethodFlagIsBlockFlag) != 0 @@ -19154,13 +19113,13 @@ sqInt classArrayClass; sqInt classArrayObj; size_t dataSize; - sqInt firstSegSize; + long firstSegSize; sqInt hdrCogCodeSize; sqInt hdrEdenBytes; sqInt hdrMaxExtSemTabSize; sqInt hdrNumStackPages; sqInt header; - sqInt headerFlags; + long headerFlags; sqInt headerSize; squeakFileOffsetType headerStart; usqInt heapSize; @@ -19177,10 +19136,23 @@ sqInt memEnd; sqInt memLimit; usqInt minimumMemory; - sqInt oldBaseAddr; + long oldBaseAddr; sqInt oop; sqInt swapBytes; sqInt sz; + int w; + long w1; + long w10; + long w11; + long w12; + long w2; + long w3; + long w4; + int w5; + short w6; + int w7; + short w8; + short w9; /* guess Metaclass instSize */ @@ -19194,18 +19166,53 @@ /* record header start position */ - headerStart = (sqImageFilePosition(f)) - BytesPerWord; - headerSize = getLongFromFileswap(f, swapBytes); - dataSize = getLongFromFileswap(f, swapBytes); - oldBaseAddr = getLongFromFileswap(f, swapBytes); + headerStart = (sqImageFilePosition(f)) - 4; + /* begin getWord32FromFile:swap: */ + w = 0; + sqImageFileRead((&w), sizeof(int), 1, f); + headerSize = (swapBytes + ? byteSwapped(w) + : w); + /* begin getLongFromFile:swap: */ + w1 = 0; + sqImageFileRead((&w1), sizeof(long), 1, f); + dataSize = ((long) ((swapBytes + ? byteSwapped(w1) + : w1))); + /* begin getLongFromFile:swap: */ + w2 = 0; + sqImageFileRead((&w2), sizeof(long), 1, f); + oldBaseAddr = (swapBytes + ? byteSwapped(w2) + : w2); /* begin specialObjectsOop: */ - anObject = getLongFromFileswap(f, swapBytes); + /* begin getLongFromFile:swap: */ + w11 = 0; + sqImageFileRead((&w11), sizeof(long), 1, f); + anObject = ((long) ((swapBytes + ? byteSwapped(w11) + : w11))); GIV(specialObjectsOop) = anObject; /* begin lastHash: */ - aValue = getLongFromFileswap(f, swapBytes); + /* begin getLongFromFile:swap: */ + w12 = 0; + sqImageFileRead((&w12), sizeof(long), 1, f); + aValue = ((long) ((swapBytes + ? byteSwapped(w12) + : w12))); lastHash = aValue; - GIV(savedWindowSize) = getLongFromFileswap(f, swapBytes); - headerFlags = getLongFromFileswap(f, swapBytes); + /* begin getLongFromFile:swap: */ + w3 = 0; + sqImageFileRead((&w3), sizeof(long), 1, f); + GIV(savedWindowSize) = ((long) ((swapBytes + ? byteSwapped(w3) + : w3))); + /* begin getLongFromFile:swap: */ + w4 = 0; + sqImageFileRead((&w4), sizeof(long), 1, f); + headerFlags = (swapBytes + ? byteSwapped(w4) + : w4); /* begin setImageHeaderFlagsFrom: */ /* so as to preserve unrecognised flags. */ @@ -19219,19 +19226,18 @@ GIV(flagInterpretedMethods) = (headerFlags & 8) != 0; GIV(preemptionYields) = (headerFlags & 16) == 0; GIV(noThreadingOfGUIThread) = (headerFlags & 32) != 0; - - /* N.B. not used. */ - - extraVMMemory = getLongFromFileswap(f, swapBytes); - - /* 4 stack pages is small. Should be able to run with as few as - three. 4 should be comfortable but slow. 8 is a reasonable - default. Can be changed via vmParameterAt: 43 put: n. - Can be set as a preference (Info.plist, VM.ini, command line etc). - If desiredNumStackPages is already non-zero then it has been - set as a preference. Ignore (but preserve) the header's default. */ - - hdrNumStackPages = getShortFromFileswap(f, swapBytes); + /* begin getWord32FromFile:swap: */ + w5 = 0; + sqImageFileRead((&w5), sizeof(int), 1, f); + extraVMMemory = (swapBytes + ? byteSwapped(w5) + : w5); + /* begin getShortFromFile:swap: */ + w6 = 0; + sqImageFileRead((&w6), sizeof(short), 1, f); + hdrNumStackPages = (swapBytes + ? byteSwapped(w6) + : w6); GIV(numStackPages) = (desiredNumStackPages != 0 ? desiredNumStackPages : (hdrNumStackPages == 0 @@ -19247,7 +19253,12 @@ : (hdrCogCodeSize == 0 ? defaultCogCodeSize() : hdrCogCodeSize)); - hdrEdenBytes = getLongFromFileswap(f, swapBytes); + /* begin getWord32FromFile:swap: */ + w7 = 0; + sqImageFileRead((&w7), sizeof(int), 1, f); + hdrEdenBytes = (swapBytes + ? byteSwapped(w7) + : w7); /* begin edenBytes: */ aValue1 = (desiredEdenBytes != 0 ? desiredEdenBytes @@ -19256,14 +19267,29 @@ : hdrEdenBytes)); GIV(edenBytes) = aValue1; desiredEdenBytes = hdrEdenBytes; - hdrMaxExtSemTabSize = getShortFromFileswap(f, swapBytes); + /* begin getShortFromFile:swap: */ + w8 = 0; + sqImageFileRead((&w8), sizeof(short), 1, f); + hdrMaxExtSemTabSize = (swapBytes + ? byteSwapped(w8) + : w8); if (hdrMaxExtSemTabSize != 0) { /* begin setMaxExtSemSizeTo: */ GIV(maxExtSemTabSizeSet) = 1; ioSetMaxExtSemTableSize(hdrMaxExtSemTabSize); } - GIV(the2ndUnknownShort) = getShortFromFileswap(f, swapBytes); - firstSegSize = getLongFromFileswap(f, swapBytes); + /* begin getShortFromFile:swap: */ + w9 = 0; + sqImageFileRead((&w9), sizeof(short), 1, f); + GIV(the2ndUnknownShort) = (swapBytes + ? byteSwapped(w9) + : w9); + /* begin getLongFromFile:swap: */ + w10 = 0; + sqImageFileRead((&w10), sizeof(long), 1, f); + firstSegSize = (swapBytes + ? byteSwapped(w10) + : w10); /* begin firstSegmentSize: */ /* no need to include the stackZone; this is alloca'ed */ @@ -19805,8 +19831,8 @@ cogMethod1 = ((CogMethod *) methodHeader1); methodHeader1 = (cogMethod1->methodHeader); } - numTemps = (((usqInt) methodHeader1) >> 19) & 0x3F; - numArgs = (((usqInt) methodHeader1) >> 25) & 15; + numTemps = (((usqInt) methodHeader1) >> MethodHeaderTempCountShift) & 0x3F; + numArgs = (((usqInt) methodHeader1) >> MethodHeaderArgCountShift) & 15; /* could new rcvr be set at point of send? */ @@ -19871,8 +19897,8 @@ GIV(stackPointer) = sp61; } if (((((sqInt) methodHeader1)) < 0 - ? methodHeader1 & (65536 << SmallIntegerShift) - : (methodHeader1 & 536871934) != 0)) { + ? methodHeader1 & AlternateHeaderHasPrimFlag + : methodHeader1 & V3PrimitiveBitsMask)) { /* Skip the CallPrimitive bytecode, if it's there, and store the error code if the method starts with a long store temp. Strictly no need to skip the store because it's effectively a noop. */ @@ -20040,8 +20066,8 @@ cogMethod1 = ((CogMethod *) methodHeader1); methodHeader1 = (cogMethod1->methodHeader); } - numTemps = (((usqInt) methodHeader1) >> 19) & 0x3F; - numArgs = (((usqInt) methodHeader1) >> 25) & 15; + numTemps = (((usqInt) methodHeader1) >> MethodHeaderTempCountShift) & 0x3F; + numArgs = (((usqInt) methodHeader1) >> MethodHeaderArgCountShift) & 15; /* could new rcvr be set at point of send? */ @@ -20106,8 +20132,8 @@ GIV(stackPointer) = sp6; } if (((((sqInt) methodHeader1)) < 0 - ? methodHeader1 & (65536 << SmallIntegerShift) - : (methodHeader1 & 536871934) != 0)) { + ? methodHeader1 & AlternateHeaderHasPrimFlag + : methodHeader1 & V3PrimitiveBitsMask)) { /* Skip the CallPrimitive bytecode, if it's there, and store the error code if the method starts with a long store temp. Strictly no need to skip the store because it's effectively a noop. */ @@ -21206,8 +21232,8 @@ assert((((((CogMethod *) header))->objectHeader)) == (nullHeaderForMachineCodeMethod())), ((((CogMethod *) header))->methodHeader))); primIdx = ((((sqInt) methodHeader)) < 0 - ? (methodHeader & (65536 << SmallIntegerShift) - ? ((firstBytecode = (oldMethod + ((LiteralStart + ((((usqInt) methodHeader) >> 1) & 0xFFFF)) * BytesPerOop)) + BaseHeaderSize), + ? (methodHeader & AlternateHeaderHasPrimFlag + ? ((firstBytecode = (oldMethod + ((LiteralStart + (((methodHeader >> 1)) & 0xFFFF)) * BytesPerOop)) + BaseHeaderSize), (byteAt(firstBytecode + 1)) + ((byteAt(firstBytecode + 2)) << 8)) : 0) : ((primBits = (methodHeader >> 1)), @@ -22219,8 +22245,8 @@ assert((((((CogMethod *) header))->objectHeader)) == (nullHeaderForMachineCodeMethod())), ((((CogMethod *) header))->methodHeader))); primIdx = ((((sqInt) methodHeader1)) < 0 - ? (methodHeader1 & (65536 << SmallIntegerShift) - ? ((firstBytecode = (oldMethod + ((LiteralStart + ((((usqInt) methodHeader1) >> 1) & 0xFFFF)) * BytesPerOop)) + BaseHeaderSize), + ? (methodHeader1 & AlternateHeaderHasPrimFlag + ? ((firstBytecode = (oldMethod + ((LiteralStart + (((methodHeader1 >> 1)) & 0xFFFF)) * BytesPerOop)) + BaseHeaderSize), (byteAt(firstBytecode + 1)) + ((byteAt(firstBytecode + 2)) << 8)) : 0) : ((primBits = (methodHeader1 >> 1)), @@ -22784,7 +22810,13 @@ return stackPageAtpages(index, GIV(pages)); } +static unsigned long +asUnsigned(sqInt anInteger) +{ + return ((unsigned long)anInteger); +} + /* Answer either a malloced string with the null-terminated contents of oop if oop is a string, or the null pointer if oop is nil, or fail. It is the client's @@ -22944,8 +22976,8 @@ sqInt sz; isSmall = (isNegative - ? magnitude <= 0x40000000 - : magnitude < 0x40000000); + ? magnitude <= ((MaxSmallInteger) + 1) + : magnitude < ((MaxSmallInteger) + 1)); if (isSmall) { smallVal = ((sqInt) magnitude); if (isNegative) { @@ -22993,13 +23025,10 @@ sqInt ccIndex1; sqInt classOop; sqInt classOop1; - sqInt fmt; - sqInt header; sqInt i; sqInt ok; sqInt smallIntValue; sqInt sz; - sqInt sz1; usqLong value; if ((oop & 1)) { @@ -23045,25 +23074,7 @@ return null; } } - /* begin lengthOf: */ - header = longAt(oop); - /* begin lengthOf:baseHeader:format: */ - fmt = (((usqInt) header) >> (instFormatFieldLSB())) & 15; - if ((header & TypeMask) == HeaderTypeSizeAndClass) { - sz1 = (longAt(oop - (BytesPerWord * 2))) & LongSizeMask; - } - else { - sz1 = header & SizeMask; - } - sz1 -= header & Size4Bit; - if (fmt <= 4) { - sz = ((usqInt) (sz1 - BaseHeaderSize)) >> (shiftForWord()); - goto l3; - } - sz = (fmt < 8 - ? ((usqInt) (sz1 - BaseHeaderSize)) >> 2 - : (sz1 - BaseHeaderSize) - (fmt & 3)); -l3: /* end lengthOf:baseHeader:format: */; + sz = numBytesOf(oop); if (sz > (sizeof(sqLong))) { /* begin primitiveFail */ @@ Diff output truncated at 50000 characters. @@

1 0

VM Maker: VMMaker.oscog-eem.948.mcz
by commits＠source.squeak.org 21 Nov '14

21 Nov '14

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.948.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.948 Author: eem Time: 20 November 2014, 6:37:08.579 pm UUID: 9323b2ad-f5cf-4aca-8f31-67eb5616ccca Ancestors: VMMaker.oscog-eem.947 Spur: Fix regression in primitiveNewWithArg from VMMaker.oscog-eem.859 which caused basicNew: on fixed classes to raise OutOfMemory instead of the relevant error. Slang: Fix FilePluginSimulator>>fileValueOf: given VMMaker.oscog-eem.946's sizeof: changes. Use isFloat instead of class == Float in anticipation of SmallFloat. =============== Diff against VMMaker.oscog-eem.947 =============== Item was changed: ----- Method: FilePluginSimulator>>fileValueOf: (in category 'simulation') ----- fileValueOf: objectPointer | index file | index := (interpreterProxy isIntegerObject: objectPointer) ifTrue: [interpreterProxy integerValueOf: objectPointer] ifFalse: [((interpreterProxy isBytes: objectPointer) + and: [(interpreterProxy byteSizeOf: objectPointer) = (self sizeof: #SQFile)]) ifFalse: - and: [(interpreterProxy byteSizeOf: objectPointer) = interpreterProxy wordSize]) ifFalse: [interpreterProxy primitiveFail. ^nil]. interpreterProxy longAt: objectPointer + interpreterProxy baseHeaderSize]. file := openFiles at: index. "this attempts to preserve file positions across snapshots when debugging the VM requires saving an image in full flight and pushing it over the cliff time after time..." (file closed and: [states includesKey: file]) ifTrue: [[:pos :isBinary| file reopen; position: pos. isBinary ifTrue: [file binary]] valueWithArguments: (states at: file)]. ^file! Item was changed: ----- Method: InterpreterPrimitives>>primitiveNewWithArg (in category 'object access primitives') ----- primitiveNewWithArg "Allocate a new indexable instance. Fail if the allocation would leave less than lowSpaceThreshold bytes free. May cause a GC." + | size spaceOkay instSpec | - | size spaceOkay | size := self positiveMachineIntegerValueOf: self stackTop. self cppIf: NewspeakVM ifTrue: "For the mirror prims check that the class obj is actually a valid class." [(argumentCount < 2 or: [self addressCouldBeClassObj: (self stackValue: 1)]) ifFalse: [self primitiveFailFor: PrimErrBadArgument]]. self successful "positiveMachineIntegerValueOf: succeeds only for non-negative integers." ifTrue: [objectMemory hasSpurMemoryManagerAPI ifTrue: [(objectMemory instantiateClass: (self stackValue: 1) indexableSize: size) ifNotNil: [:obj| self pop: argumentCount + 1 thenPush: obj] + ifNil: [instSpec := objectMemory instSpecOfClass: (self stackValue: 1). + self primitiveFailFor: (((objectMemory isIndexableFormat: instSpec) + and: [(objectMemory isCompiledMethodFormat: instSpec) not]) + ifTrue: [PrimErrNoMemory] + ifFalse: [PrimErrBadReceiver])]] - ifNil: [self primitiveFailFor: ((objectMemory isCompiledMethodFormat: (objectMemory instSpecOfClass: (self stackValue: 1))) - ifTrue: [PrimErrBadReceiver] - ifFalse: [PrimErrNoMemory])]] ifFalse: [spaceOkay := objectMemory sufficientSpaceToInstantiate: (self stackValue: 1) indexableSize: size. spaceOkay ifTrue: [self pop: argumentCount + 1 thenPush: (objectMemory instantiateClass: (self stackValue: 1) indexableSize: size)] ifFalse: [self primitiveFailFor: PrimErrNoMemory]]] ifFalse: [self primitiveFailFor: PrimErrBadArgument]! Item was changed: ----- Method: InterpreterProxy>>floatObjectOf: (in category 'converting') ----- floatObjectOf: aFloat <returnTypeC: #sqInt> "...because answering the float argument causes the type inferencer to say this answers a float." <var: #aFloat type: 'double '> + aFloat isFloat ifFalse:[self error:'Not a float object']. - aFloat class == Float ifFalse:[self error:'Not a float object']. ^aFloat! Item was changed: ----- Method: InterpreterProxy>>floatValueOf: (in category 'converting') ----- floatValueOf: oop <returnTypeC:'double'> + oop isFloat - oop class == Float ifTrue:[^oop] ifFalse:[self primitiveFail. ^0.0].! Item was changed: ----- Method: InterpreterProxy>>isFloatObject: (in category 'testing') ----- isFloatObject: oop + ^oop isFloat! - ^oop class == Float! Item was changed: ----- Method: InterpreterProxy>>pushFloat: (in category 'stack access') ----- pushFloat: f <var: #f type: 'double '> + f isFloat ifFalse:[^self error:'Not a Float']. - f class == Float ifFalse:[^self error:'Not a Float']. self push: f.! Item was changed: ----- Method: Spur64BitMemoryManager class>>isImmediate: (in category 'simulation only') ----- isImmediate: anObject self flag: 'The float range is close but probably wrong. Revisit when immediate floats are implemented'. + ^(anObject isInteger and: [anObject between: self minSmallInteger and: self maxSmallInteger]) + or: [anObject isCharacter + or: [anObject isFloat and: [anObject exponent between: -126 and: 127]]] + + "1.0e-38 exponent -127 + 1.0e38 exponent 126 + + NumberParser new makeFloatFromMantissa: 1 exponent: 127 base: 2 1.7014118346046923e38 + (NumberParser new makeFloatFromMantissa: 1 exponent: 127 base: 2) exponent 127 + NumberParser new makeFloatFromMantissa: 1 exponent: -126 base: 2 1.1754943508222875e-38 + (NumberParser new makeFloatFromMantissa: 1 exponent: -126 base: 2) exponent -126"! - ^anObject class == SmallInteger - or: [anObject class == Character - or: [anObject class == Float and: [anObject exponent between: -128 and: 127]]]!

1 0

VM Maker: Cog-eem.222.mcz
by commits＠source.squeak.org 21 Nov '14

21 Nov '14

Eliot Miranda uploaded a new version of Cog to project VM Maker: http://source.squeak.org/VMMaker/Cog-eem.222.mcz ==================== Summary ==================== Name: Cog-eem.222 Author: eem Time: 20 November 2014, 4:52:34.938 pm UUID: 1219d9fd-6d24-43ca-a583-6fd362db2b08 Ancestors: Cog-eem.221 Merge with Cog.pharo-EstebanLorenzano.221. Move Squeak prototype classes under SpurBootstrapSqueakFamilyPrototypes. Move ClassBuilder and InstructionPrinter prototypes down into SpurBootstrapSqueakFamilyPrototypes. Add Cog test xray methods to Context. Happy Birthday Esteban! =============== Diff against Cog-eem.221 =============== Item was added: + ----- Method: Context>>ContextPROTOTYPEobjectClass: (in category '*Cog-method prototypes') ----- + ContextPROTOTYPEobjectClass: aReceiver + <primitive: 111> + self primitiveFailed! Item was added: + ----- Method: Context>>xray (in category '*Cog-Tests-xrays') ----- + xray + "Lift the veil from a context and answer an integer describing its interior state. + Used for e.g. VM tests so they can verify they're testing what they think they're testing. + 0 implies a vanilla heap context. + Bit 0 = is or was married to a frame + Bit 1 = is still married to a frame + Bit 2 = frame is executing machine code + Bit 3 = has machine code pc (as opposed to nil or a bytecode pc) + Bit 4 = method is currently compiled to machine code" + <primitive: 213> + ^0 "Can only fail if unimplemented; therefore simply answer 0"! Item was added: + ----- Method: Context>>xrayIsDivorced (in category '*Cog-Tests-xrays') ----- + xrayIsDivorced + ^(self xray bitAnd: 3) = 1! Item was added: + ----- Method: Context>>xrayIsExecutingMachineCode (in category '*Cog-Tests-xrays') ----- + xrayIsExecutingMachineCode + ^self xray anyMask: 4! Item was added: + ----- Method: Context>>xrayIsMarried (in category '*Cog-Tests-xrays') ----- + xrayIsMarried + ^self xray anyMask: 2! Item was added: + ----- Method: Context>>xrayLastExecutedMachineCode (in category '*Cog-Tests-xrays') ----- + xrayLastExecutedMachineCode + ^self xray anyMask: 8! Item was added: + ----- Method: Context>>xrayMethodIsCompiledToMachineCode (in category '*Cog-Tests-xrays') ----- + xrayMethodIsCompiledToMachineCode + ^self xray anyMask: 16! Item was changed: ----- Method: SpurBootstrap class>>bootstrapPharoImage: (in category 'utilities') ----- bootstrapPharoImage: imageFileBaseName + | oldCompilerClass oldBytecodeBackend | - | oldCompilerClass | oldCompilerClass := SmalltalkImage compilerClass. + oldBytecodeBackend := CompilationContext bytecodeBackend. [ SmalltalkImage compilerClass: Compiler. + CompilationContext bytecodeBackend: IRSpurSqueakV3PlusClosuresBytecodeGenerator. self bootstrapImage: imageFileBaseName type: 'pharo' ] + ensure: [ + SmalltalkImage compilerClass: oldCompilerClass. + CompilationContext bytecodeBackend: oldBytecodeBackend ]! - ensure: [ SmalltalkImage compilerClass: oldCompilerClass ]. - ! Item was changed: ----- Method: SpurBootstrapPharoPrototypes>>CharacterPROTOTYPEcodePoint (in category 'method prototypes') ----- CharacterPROTOTYPEcodePoint "Just for ANSI Compliance" + ^self asciiValue! - ^self! Item was added: + ----- Method: SpurBootstrapPharoPrototypes>>CharacterPROTOTYPEshallowCopy (in category 'method prototypes') ----- + CharacterPROTOTYPEshallowCopy + "Answer the receiver, because Characters are unique." + ^self! Item was added: + ----- Method: SpurBootstrapPharoPrototypes>>ContextPROTOTYPEobjectClass: (in category 'method prototypes') ----- + ContextPROTOTYPEobjectClass: aReceiver + <indirect>! Item was removed: - ----- Method: SpurBootstrapPrototypes>>ClassBuilderPROTOTYPEcomputeFormat:instSize:forSuper:ccIndex: (in category 'method prototypes') ----- - ClassBuilderPROTOTYPEcomputeFormat: type instSize: newInstSize forSuper: newSuper ccIndex: ccIndex - "Compute the new format for making oldClass a subclass of newSuper. - Answer the format or nil if there is any problem." - | instSize isVar isWords isPointers isWeak | - type == #compiledMethod ifTrue: - [newInstSize > 0 ifTrue: - [self error: 'A compiled method class cannot have named instance variables'. - ^nil]. - ^CompiledMethod format]. - instSize := newInstSize + (newSuper ifNil:[0] ifNotNil:[newSuper instSize]). - instSize > 65535 ifTrue: - [self error: 'Class has too many instance variables (', instSize printString,')'. - ^nil]. - type == #normal ifTrue:[isVar := isWeak := false. isWords := isPointers := true]. - type == #bytes ifTrue:[isVar := true. isWords := isPointers := isWeak := false]. - type == #words ifTrue:[isVar := isWords := true. isPointers := isWeak := false]. - type == #variable ifTrue:[isVar := isPointers := isWords := true. isWeak := false]. - type == #weak ifTrue:[isVar := isWeak := isWords := isPointers := true]. - type == #ephemeron ifTrue:[isVar := false. isWeak := isWords := isPointers := true]. - type == #immediate ifTrue:[isVar := isWeak := isPointers := false. isWords := true]. - (isPointers not and: [instSize > 0]) ifTrue: - [self error: 'A non-pointer class cannot have named instance variables'. - ^nil]. - ^self format: instSize variable: isVar words: isWords pointers: isPointers weak: isWeak! Item was removed: - ----- Method: SpurBootstrapPrototypes>>ClassBuilderPROTOTYPEformat:variable:words:pointers:weak: (in category 'method prototypes') ----- - ClassBuilderPROTOTYPEformat: nInstVars variable: isVar words: is32BitWords pointers: isPointers weak: isWeak - "Compute the format for the given instance specfication. - Above Cog Spur the class format is - <5 bits inst spec><16 bits inst size> - where the 5-bit inst spec is - 0 = 0 sized objects (UndefinedObject True False et al) - 1 = non-indexable objects with inst vars (Point et al) - 2 = indexable objects with no inst vars (Array et al) - 3 = indexable objects with inst vars (MethodContext AdditionalMethodState et al) - 4 = weak indexable objects with inst vars (WeakArray et al) - 5 = weak non-indexable objects with inst vars (ephemerons) (Ephemeron) - 6 = unused - 7 = immediates (SmallInteger, Character) - 8 = unused - 9 = reserved for 64-bit indexable - 10-11 = 32-bit indexable (Bitmap) - 12-15 = 16-bit indexable - 16-23 = 8-bit indexable - 24-31 = compiled methods (CompiledMethod)" - | instSpec | - instSpec := isWeak - ifTrue: - [isVar - ifTrue: [4] - ifFalse: [5]] - ifFalse: - [isPointers - ifTrue: - [isVar - ifTrue: [nInstVars > 0 ifTrue: [3] ifFalse: [2]] - ifFalse: [nInstVars > 0 ifTrue: [1] ifFalse: [0]]] - ifFalse: - [isVar - ifTrue: [is32BitWords ifTrue: [10] ifFalse: [16]] - ifFalse: [7]]]. - ^(instSpec bitShift: 16) + nInstVars! Item was removed: - ----- Method: SpurBootstrapPrototypes>>ClassBuilderPROTOTYPEsuperclass:immediateSubclass:instanceVariableNames:classVariableNames:poolDictionaries:category: (in category 'method prototypes') ----- - ClassBuilderPROTOTYPEsuperclass: aClass - immediateSubclass: t instanceVariableNames: f - classVariableNames: d poolDictionaries: s category: cat - "This is the standard initialization message for creating a - new immediate class as a subclass of an existing class." - | env | - aClass instSize > 0 - ifTrue: [^self error: 'cannot make an immediate subclass of a class with named fields']. - aClass isVariable - ifTrue: [^self error: 'cannot make an immediate subclass of a class with indexed instance variables']. - aClass isPointers - ifFalse: [^self error: 'cannot make an immediate subclass of a class without pointer fields']. - "Cope with pre-environment and environment versions. Simplify asap." - env := (Smalltalk classNamed: #EnvironmentRequest) - ifNil: [aClass environment] - ifNotNil: [:erc| erc signal ifNil: [aClass environment]]. - ^self - name: t - inEnvironment: env - subclassOf: aClass - type: #immediate - instanceVariableNames: f - classVariableNames: d - poolDictionaries: s - category: cat! Item was removed: - ----- Method: SpurBootstrapPrototypes>>ClassBuilderPROTOTYPEupdate:to: (in category 'method prototypes') ----- - ClassBuilderPROTOTYPEupdate: oldClass to: newClass - "Convert oldClass, all its instances and possibly its meta class into newClass, - instances of newClass and possibly its meta class. The process is surprisingly - simple in its implementation and surprisingly complex in its nuances and potentially - bad side effects. - We can rely on two assumptions (which are critical): - #1: The method #updateInstancesFrom: will not create any lasting pointers to - 'old' instances ('old' is quote on quote since #updateInstancesFrom: will do - a become of the old vs. the new instances and therefore it will not create - pointers to *new* instances before the #become: which are *old* afterwards) - #2: The non-preemptive execution of the critical piece of code guarantees that - nobody can get a hold by 'other means' (such as process interruption and - reflection) on the old instances. - Given the above two, we know that after #updateInstancesFrom: there are no pointers - to any old instances. After the forwarding become there will be no pointers to the old - class or meta class either. - Andreas Raab, 2/27/2003 23:42" - | meta | - meta := oldClass isMeta. - "Note: Everything from here on will run without the ability to get interrupted - to prevent any other process to create new instances of the old class." - ["Note: The following removal may look somewhat obscure and needs an explanation. - When we mutate the class hierarchy we create new classes for any existing subclass. - So it may look as if we don't have to remove the old class from its superclass. However, - at the top of the hierarchy (the first class we reshape) that superclass itself is not newly - created so therefore it will hold both the oldClass and newClass in its (obsolete or not) - subclasses. Since the #become: below will transparently replace the pointers to oldClass - with newClass the superclass would have newClass in its subclasses TWICE. With rather - unclear effects if we consider that we may convert the meta-class hierarchy itself (which - is derived from the non-meta class hierarchy). - Due to this problem ALL classes are removed from their superclass just prior to converting - them. Here, breaking the superclass/subclass invariant really doesn't matter since we will - effectively remove the oldClass (becomeForward:) just a few lines below." - - oldClass superclass removeSubclass: oldClass. - oldClass superclass removeObsoleteSubclass: oldClass. - - "make sure that the VM cache is clean" - oldClass methodDict do: [:cm | cm flushCache]. - - "Convert the instances of oldClass into instances of newClass" - newClass updateInstancesFrom: oldClass. - - meta - ifTrue: - [oldClass becomeForward: newClass. - oldClass updateMethodBindingsTo: oldClass binding] - ifFalse: - [{oldClass. oldClass class} elementsForwardIdentityTo: {newClass. newClass class}. - oldClass updateMethodBindingsTo: oldClass binding. - oldClass class updateMethodBindingsTo: oldClass class binding]. - - "eem 5/31/2014 07:22 At this point there used to be a garbage collect whose purpose was - to ensure no old instances existed after the becomeForward:. Without the GC it was possible - to resurrect old instances using e.g. allInstancesDo:. This was because the becomeForward: - updated references from the old objects to new objects but didn't destroy the old objects. - But as of late 2013/early 2014 becomeForward: has been modified to free all the old objects."] - valueUnpreemptively! Item was removed: - ----- Method: SpurBootstrapPrototypes>>InstructionPrinterPROTOTYPEcallPrimitive: (in category 'method prototypes') ----- - InstructionPrinterPROTOTYPEcallPrimitive: index - "Print the callPrimitive." - - self print: 'callPrimtive: ' , index printString! Item was changed: + SpurBootstrapSqueakFamilyPrototypes subclass: #SpurBootstrapSqueak43Prototypes - SpurBootstrapPrototypes subclass: #SpurBootstrapSqueak43Prototypes instanceVariableNames: '' classVariableNames: '' poolDictionaries: '' category: 'Cog-Bootstrapping'! Item was added: + SpurBootstrapPrototypes subclass: #SpurBootstrapSqueakFamilyPrototypes + instanceVariableNames: '' + classVariableNames: '' + poolDictionaries: '' + category: 'Cog-Bootstrapping'! Item was added: + ----- Method: SpurBootstrapSqueakFamilyPrototypes>>ClassBuilderPROTOTYPEcomputeFormat:instSize:forSuper:ccIndex: (in category 'method prototypes') ----- + ClassBuilderPROTOTYPEcomputeFormat: type instSize: newInstSize forSuper: newSuper ccIndex: ccIndex + "Compute the new format for making oldClass a subclass of newSuper. + Answer the format or nil if there is any problem." + | instSize isVar isWords isPointers isWeak | + type == #compiledMethod ifTrue: + [newInstSize > 0 ifTrue: + [self error: 'A compiled method class cannot have named instance variables'. + ^nil]. + ^CompiledMethod format]. + instSize := newInstSize + (newSuper ifNil:[0] ifNotNil:[newSuper instSize]). + instSize > 65535 ifTrue: + [self error: 'Class has too many instance variables (', instSize printString,')'. + ^nil]. + type == #normal ifTrue:[isVar := isWeak := false. isWords := isPointers := true]. + type == #bytes ifTrue:[isVar := true. isWords := isPointers := isWeak := false]. + type == #words ifTrue:[isVar := isWords := true. isPointers := isWeak := false]. + type == #variable ifTrue:[isVar := isPointers := isWords := true. isWeak := false]. + type == #weak ifTrue:[isVar := isWeak := isWords := isPointers := true]. + type == #ephemeron ifTrue:[isVar := false. isWeak := isWords := isPointers := true]. + type == #immediate ifTrue:[isVar := isWeak := isPointers := false. isWords := true]. + (isPointers not and: [instSize > 0]) ifTrue: + [self error: 'A non-pointer class cannot have named instance variables'. + ^nil]. + ^self format: instSize variable: isVar words: isWords pointers: isPointers weak: isWeak! Item was added: + ----- Method: SpurBootstrapSqueakFamilyPrototypes>>ClassBuilderPROTOTYPEformat:variable:words:pointers:weak: (in category 'method prototypes') ----- + ClassBuilderPROTOTYPEformat: nInstVars variable: isVar words: is32BitWords pointers: isPointers weak: isWeak + "Compute the format for the given instance specfication. + Above Cog Spur the class format is + <5 bits inst spec><16 bits inst size> + where the 5-bit inst spec is + 0 = 0 sized objects (UndefinedObject True False et al) + 1 = non-indexable objects with inst vars (Point et al) + 2 = indexable objects with no inst vars (Array et al) + 3 = indexable objects with inst vars (MethodContext AdditionalMethodState et al) + 4 = weak indexable objects with inst vars (WeakArray et al) + 5 = weak non-indexable objects with inst vars (ephemerons) (Ephemeron) + 6 = unused + 7 = immediates (SmallInteger, Character) + 8 = unused + 9 = reserved for 64-bit indexable + 10-11 = 32-bit indexable (Bitmap) + 12-15 = 16-bit indexable + 16-23 = 8-bit indexable + 24-31 = compiled methods (CompiledMethod)" + | instSpec | + instSpec := isWeak + ifTrue: + [isVar + ifTrue: [4] + ifFalse: [5]] + ifFalse: + [isPointers + ifTrue: + [isVar + ifTrue: [nInstVars > 0 ifTrue: [3] ifFalse: [2]] + ifFalse: [nInstVars > 0 ifTrue: [1] ifFalse: [0]]] + ifFalse: + [isVar + ifTrue: [is32BitWords ifTrue: [10] ifFalse: [16]] + ifFalse: [7]]]. + ^(instSpec bitShift: 16) + nInstVars! Item was added: + ----- Method: SpurBootstrapSqueakFamilyPrototypes>>ClassBuilderPROTOTYPEsuperclass:immediateSubclass:instanceVariableNames:classVariableNames:poolDictionaries:category: (in category 'method prototypes') ----- + ClassBuilderPROTOTYPEsuperclass: aClass + immediateSubclass: t instanceVariableNames: f + classVariableNames: d poolDictionaries: s category: cat + "This is the standard initialization message for creating a + new immediate class as a subclass of an existing class." + | env | + aClass instSize > 0 + ifTrue: [^self error: 'cannot make an immediate subclass of a class with named fields']. + aClass isVariable + ifTrue: [^self error: 'cannot make an immediate subclass of a class with indexed instance variables']. + aClass isPointers + ifFalse: [^self error: 'cannot make an immediate subclass of a class without pointer fields']. + "Cope with pre-environment and environment versions. Simplify asap." + env := (Smalltalk classNamed: #EnvironmentRequest) + ifNil: [aClass environment] + ifNotNil: [:erc| erc signal ifNil: [aClass environment]]. + ^self + name: t + inEnvironment: env + subclassOf: aClass + type: #immediate + instanceVariableNames: f + classVariableNames: d + poolDictionaries: s + category: cat! Item was added: + ----- Method: SpurBootstrapSqueakFamilyPrototypes>>ClassBuilderPROTOTYPEupdate:to: (in category 'method prototypes') ----- + ClassBuilderPROTOTYPEupdate: oldClass to: newClass + "Convert oldClass, all its instances and possibly its meta class into newClass, + instances of newClass and possibly its meta class. The process is surprisingly + simple in its implementation and surprisingly complex in its nuances and potentially + bad side effects. + We can rely on two assumptions (which are critical): + #1: The method #updateInstancesFrom: will not create any lasting pointers to + 'old' instances ('old' is quote on quote since #updateInstancesFrom: will do + a become of the old vs. the new instances and therefore it will not create + pointers to *new* instances before the #become: which are *old* afterwards) + #2: The non-preemptive execution of the critical piece of code guarantees that + nobody can get a hold by 'other means' (such as process interruption and + reflection) on the old instances. + Given the above two, we know that after #updateInstancesFrom: there are no pointers + to any old instances. After the forwarding become there will be no pointers to the old + class or meta class either. + Andreas Raab, 2/27/2003 23:42" + | meta | + meta := oldClass isMeta. + "Note: Everything from here on will run without the ability to get interrupted + to prevent any other process to create new instances of the old class." + ["Note: The following removal may look somewhat obscure and needs an explanation. + When we mutate the class hierarchy we create new classes for any existing subclass. + So it may look as if we don't have to remove the old class from its superclass. However, + at the top of the hierarchy (the first class we reshape) that superclass itself is not newly + created so therefore it will hold both the oldClass and newClass in its (obsolete or not) + subclasses. Since the #become: below will transparently replace the pointers to oldClass + with newClass the superclass would have newClass in its subclasses TWICE. With rather + unclear effects if we consider that we may convert the meta-class hierarchy itself (which + is derived from the non-meta class hierarchy). + Due to this problem ALL classes are removed from their superclass just prior to converting + them. Here, breaking the superclass/subclass invariant really doesn't matter since we will + effectively remove the oldClass (becomeForward:) just a few lines below." + + oldClass superclass removeSubclass: oldClass. + oldClass superclass removeObsoleteSubclass: oldClass. + + "make sure that the VM cache is clean" + oldClass methodDict do: [:cm | cm flushCache]. + + "Convert the instances of oldClass into instances of newClass" + newClass updateInstancesFrom: oldClass. + + meta + ifTrue: + [oldClass becomeForward: newClass. + oldClass updateMethodBindingsTo: oldClass binding] + ifFalse: + [{oldClass. oldClass class} elementsForwardIdentityTo: {newClass. newClass class}. + oldClass updateMethodBindingsTo: oldClass binding. + oldClass class updateMethodBindingsTo: oldClass class binding]. + + "eem 5/31/2014 07:22 At this point there used to be a garbage collect whose purpose was + to ensure no old instances existed after the becomeForward:. Without the GC it was possible + to resurrect old instances using e.g. allInstancesDo:. This was because the becomeForward: + updated references from the old objects to new objects but didn't destroy the old objects. + But as of late 2013/early 2014 becomeForward: has been modified to free all the old objects."] + valueUnpreemptively! Item was added: + ----- Method: SpurBootstrapSqueakFamilyPrototypes>>InstructionPrinterPROTOTYPEcallPrimitive: (in category 'method prototypes') ----- + InstructionPrinterPROTOTYPEcallPrimitive: index + "Print the callPrimitive." + + self print: 'callPrimtive: ' , index printString! Item was changed: + SpurBootstrapSqueakFamilyPrototypes subclass: #SpurBootstrapSqueakPrototypes - SpurBootstrapPrototypes subclass: #SpurBootstrapSqueakPrototypes instanceVariableNames: '' classVariableNames: '' poolDictionaries: '' category: 'Cog-Bootstrapping'!

1 0

VM Maker: VMMaker.oscog-eem.947.mcz
by commits＠source.squeak.org 21 Nov '14

21 Nov '14

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.947.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.947 Author: eem Time: 20 November 2014, 4:06:51.711 pm UUID: bfefff63-4592-4c2c-84d9-4d8753db03ba Ancestors: VMMaker.oscog-eem.946 Add class side implementations of min/maxSmallInteger as required for translation. Add a first cut at the primitiveSlotAt[Put] primitives. If asUnsignedLong needs an assert to check for > 0 then so does asUnsignedInteger. Spur: Have checkForAndFollowForwardedPrimitiveState follow other referencesin the frame if a forwarder is found on the stack. =============== Diff against VMMaker.oscog-eem.946 =============== Item was changed: ----- Method: Integer>>asUnsignedInteger (in category '*VMMaker-interpreter simulator') ----- asUnsignedInteger + self assert: self >= 0. ^self! Item was added: + ----- Method: InterpreterPrimitives>>asUnsigned: (in category 'primitive support') ----- + asUnsigned: anInteger + <inline: true> + ^self cCode: [anInteger asUnsignedLong] inSmalltalk: [anInteger bitAnd: objectMemory maxSmallInteger]! Item was added: + ----- Method: InterpreterPrimitives>>primitiveSlotAt (in category 'object access primitives') ----- + primitiveSlotAt + | index rcvr numSlots | + index := self stackTop. + rcvr := self stackValue: 1. + (objectMemory isIntegerObject: index) ifFalse: + [^self primitiveFailFor: PrimErrBadArgument]. + (objectMemory isImmediate: rcvr) ifTrue: + [^self primitiveFailFor: PrimErrBadReceiver]. + index := objectMemory integerValueOf: index. + (objectMemory isPointersNonImm: rcvr) ifTrue: + [numSlots := objectMemory numSlotsOf: rcvr. + (self asUnsigned: index) < numSlots ifTrue: + [self pop: argumentCount + 1 thenPush: (objectMemory fetchPointer: index ofObject: rcvr). + ^0]. + ^self primitiveFailFor: PrimErrBadIndex]. + "for now just fail for non-pointer objects; the issue here is should + strings answer characters and if so how do we efficiently identify strings?" + ^self primitiveFailFor: PrimErrBadReceiver! Item was added: + ----- Method: InterpreterPrimitives>>primitiveSlotAtPut (in category 'object access primitives') ----- + primitiveSlotAtPut + | newValue index rcvr numSlots | + newValue := self stackTop. + index := self stackValue: 1. + rcvr := self stackValue: 2. + (objectMemory isIntegerObject: index) ifFalse: + [^self primitiveFailFor: PrimErrBadArgument]. + (objectMemory isImmediate: rcvr) ifTrue: + [^self primitiveFailFor: PrimErrBadReceiver]. + index := objectMemory integerValueOf: index. + (objectMemory isPointersNonImm: rcvr) ifTrue: + [numSlots := objectMemory numSlotsOf: rcvr. + (self asUnsigned: index) < numSlots ifTrue: + [objectMemory storePointer: index ofObject: rcvr withValue: newValue. + self pop: argumentCount + 1 thenPush: newValue. + ^0]. + ^self primitiveFailFor: PrimErrBadIndex]. + "for now just fail for non-pointer objects; the issue here is should + strings answer characters and if so how do we efficiently identify strings?" + ^self primitiveFailFor: PrimErrBadReceiver! Item was added: + ----- Method: ObjectMemory class>>maxSmallInteger (in category 'translation') ----- + maxSmallInteger + ^1073741823! Item was added: + ----- Method: ObjectMemory class>>minSmallInteger (in category 'translation') ----- + minSmallInteger + ^-1073741824! Item was added: + ----- Method: Spur32BitMemoryManager class>>maxSmallInteger (in category 'translation') ----- + maxSmallInteger + ^16r3FFFFFFF! Item was added: + ----- Method: Spur32BitMemoryManager class>>minSmallInteger (in category 'translation') ----- + minSmallInteger + ^-16r40000000! Item was added: + ----- Method: Spur64BitMemoryManager class>>maxSmallInteger (in category 'translation') ----- + maxSmallInteger + ^16rFFFFFFFFFFFFFFF! Item was added: + ----- Method: Spur64BitMemoryManager class>>minSmallInteger (in category 'translation') ----- + minSmallInteger + ^-16r1000000000000000! Item was added: + ----- Method: SpurMemoryManager>>maxSmallInteger (in category 'interpreter access') ----- + maxSmallInteger + self subclassResponsibility! Item was changed: ----- Method: StackInterpreter class>>initializePrimitiveTable (in category 'initialization') ----- (excessive size, no diff calculated) Item was changed: ----- Method: StackInterpreter>>checkForAndFollowForwardedPrimitiveState (in category 'primitive support') ----- checkForAndFollowForwardedPrimitiveState "In Spur a primitive may fail due to encountering a forwarder. On failure, check the accessorDepth for the primitive and if non-negative scan the args to the depth, following any forwarders. Answer if any are found so the prim can be retried. The primitive index is derived from newMethod. If the primitive is 118, then primitiveDoPrimitiveWithArgs sets newMethod to a SmallInteger whose value is the primitive it is evaluating." <option: #SpurObjectMemory> + | primIndex accessorDepth found scannedStackFrame | - | primIndex accessorDepth found | self assert: self failed. + found := scannedStackFrame := false. - found := false. primIndex := (objectMemory isIntegerObject: newMethod) ifTrue: [objectMemory integerValueOf: newMethod] ifFalse: [self assert: argumentCount = (self argumentCountOf: newMethod). self primitiveIndexOf: newMethod]. accessorDepth := primitiveAccessorDepthTable at: primIndex. "For the method-executing primitives, failure could have been in those primitives or the primitives of the methods they execute. Find out which failed by seeing what is in effect." ((primIndex = 117 and: [primitiveFunctionPointer ~~ #primitiveExternalCall]) or: [primIndex = 218 and: [primitiveFunctionPointer ~~ #primitiveDoNamedPrimitiveWithArgs]]) ifTrue: [accessorDepth := self primitiveAccessorDepthForExternalPrimitiveMethod: newMethod] ifFalse: [self assert: (self saneFunctionPointerForFailureOfPrimIndex: primIndex)]. accessorDepth >= 0 ifTrue: [0 to: argumentCount do: [:index| | oop | oop := self stackValue: index. (objectMemory isNonImmediate: oop) ifTrue: [(objectMemory isForwarded: oop) ifTrue: [self assert: index < argumentCount. "receiver should have been caught at send time." found := true. oop := objectMemory followForwarded: oop. + self stackValue: index put: oop. + scannedStackFrame ifFalse: + [scannedStackFrame := true. + self + followForwardedFrameContents: framePointer + stackPointer: stackPointer + (argumentCount + 1 * objectMemory wordSize) "don't repeat effort"]]. - self stackValue: index put: oop]. ((objectMemory hasPointerFields: oop) and: [objectMemory followForwardedObjectFields: oop toDepth: accessorDepth]) ifTrue: [found := true]]]]. ^found! Item was changed: ----- Method: StackInterpreter>>followForwardedFrameContents:stackPointer: (in category 'lazy become') ----- followForwardedFrameContents: theFP stackPointer: theSP "follow pointers in the current stack frame up to theSP." <var: #theFP type: #'char *'> <var: #theSP type: #'char *'> + <inline: false> <var: #ptr type: #'char *'> theFP + (self frameStackedReceiverOffset: theFP) to: theFP + FoxCallerSavedIP + objectMemory wordSize by: objectMemory wordSize do: [:ptr| | oop | oop := stackPages longAt: ptr. ((objectMemory isNonImmediate: oop) and: [objectMemory isForwarded: oop]) ifTrue: [stackPages longAt: ptr put: (objectMemory followForwarded: oop)]]. theSP to: (self frameReceiverOffset: theFP) by: objectMemory wordSize do: [:ptr| | oop | oop := stackPages longAt: ptr. ((objectMemory isNonImmediate: oop) and: [objectMemory isForwarded: oop]) ifTrue: [stackPages longAt: ptr put: (objectMemory followForwarded: oop)]]. self assert: (objectMemory isForwarded: (self frameMethodObject: theFP)) not. (self frameHasContext: theFP) ifTrue: [self assert: (objectMemory isForwarded: (self frameContext: theFP)) not]! Item was added: + ----- Method: StackInterpreterPrimitives>>primitiveSlotAt (in category 'object access primitives') ----- + primitiveSlotAt + | index rcvr numSlots value | + index := self stackTop. + rcvr := self stackValue: 1. + (objectMemory isIntegerObject: index) ifFalse: + [^self primitiveFailFor: PrimErrBadArgument]. + (objectMemory isImmediate: rcvr) ifTrue: + [^self primitiveFailFor: PrimErrBadReceiver]. + index := objectMemory integerValueOf: index. + (objectMemory isPointersNonImm: rcvr) ifTrue: + [numSlots := objectMemory numSlotsOf: rcvr. + (self asUnsigned: index) < numSlots ifTrue: + [(objectMemory isContextNonImm: rcvr) + ifTrue: [value := self externalInstVar: index ofContext: rcvr] + ifFalse: [value := objectMemory fetchPointer: index ofObject: rcvr]. + self pop: argumentCount + 1 thenPush: value. + ^0]. + ^self primitiveFailFor: PrimErrBadIndex]. + "for now just fail for non-pointer objects; the issue here is should + strings answer characters and if so how do we efficiently identify strings?" + ^self primitiveFailFor: PrimErrBadReceiver! Item was added: + ----- Method: StackInterpreterPrimitives>>primitiveSlotAtPut (in category 'object access primitives') ----- + primitiveSlotAtPut + | newValue index rcvr numSlots | + newValue := self stackTop. + index := self stackValue: 1. + rcvr := self stackValue: 2. + (objectMemory isIntegerObject: index) ifFalse: + [^self primitiveFailFor: PrimErrBadArgument]. + (objectMemory isImmediate: rcvr) ifTrue: + [^self primitiveFailFor: PrimErrBadReceiver]. + index := objectMemory integerValueOf: index. + (objectMemory isPointersNonImm: rcvr) ifTrue: + [numSlots := objectMemory numSlotsOf: rcvr. + (self asUnsigned: index) < numSlots ifTrue: + [(objectMemory isContextNonImm: rcvr) + ifTrue: [self externalInstVar: index ofContext: rcvr put: newValue] + ifFalse: [objectMemory storePointer: index ofObject: rcvr withValue: newValue]. + self pop: argumentCount + 1 thenPush: newValue. + ^0]. + ^self primitiveFailFor: PrimErrBadIndex]. + "for now just fail for non-pointer objects; the issue here is should + strings answer characters and if so how do we efficiently identify strings?" + ^self primitiveFailFor: PrimErrBadReceiver!

1 0

VM Maker: Cog-eem.221.mcz
by commits＠source.squeak.org 21 Nov '14

21 Nov '14

Eliot Miranda uploaded a new version of Cog to project VM Maker: http://source.squeak.org/VMMaker/Cog-eem.221.mcz ==================== Summary ==================== Name: Cog-eem.221 Author: eem Time: 20 November 2014, 3:58:10.467 pm UUID: b536eda6-7af8-4bdc-b5ce-fa4eee1377de Ancestors: Cog-eem.220 Spur bootstrap. Update SmallInteger's class comment to match Kernel-eem.886 =============== Diff against Cog-eem.220 =============== Item was changed: ----- Method: SpurBootstrapMonticelloPackagePatcher>>patchForPackage:withPatches:snapshot: (in category 'patching') ----- patchForPackage: package withPatches: patches snapshot: snapshot (package includesClass: Character) ifTrue: [patches addAll: ((self modifiedCharacterDefinitionsIn: snapshot definitions) select: [:def| patches noneSatisfy: [:addition| def isMethodDefinition and: [addition definition isMethodDefinition and: [addition definition selector = def selector and: [addition definition className = def className and: [addition definition classIsMeta = def classIsMeta]]]]]] thenCollect: [:def| ((def source includesSubString: 'DELETEME') ifTrue: [MCRemoval] ifFalse: [MCAddition]) of: def]); add: (self immediateClassDefinitionFor: #Character from: snapshot definitions comment: 'I represent a character by storing its associated Unicode as an unsigned 30-bit value. Characters are created uniquely, so that all instances of a particular Unicode are identical. My instances are encoded in tagged pointers in the VM, so called immediates, and therefore are pure immutable values. The code point is based on Unicode. Since Unicode is 21-bit wide character set, we have several bits available for other information. As the Unicode Standard states, a Unicode code point doesn''t carry the language information. This is going to be a problem with the languages so called CJK (Chinese, Japanese, Korean. Or often CJKV including Vietnamese). Since the characters of those languages are unified and given the same code point, it is impossible to display a bare Unicode code point in an inspector or such tools. To utilize the extra available bits, we use them for identifying the languages. Since the old implementation uses the bits to identify the character encoding, the bits are sometimes called "encoding tag" or neutrally "leading char", but the bits rigidly denotes the concept of languages. The other languages can have the language tag if you like. This will help to break the large default font (font set) into separately loadable chunk of fonts. However, it is open to the each native speakers and writers to decide how to define the character equality, since the same Unicode code point may have different language tag thus simple #= comparison may return false.' stamp: 'eem 8/12/2014 14:53')]. (package includesClass: SmallInteger) ifTrue: [patches add: (self immediateClassDefinitionFor: #SmallInteger from: snapshot definitions + comment: 'My instances are at least 31-bit numbers, stored in twos complement form. The allowable range in 32-bits is approximately +- 10^9 (+- 1billion). In 64-bits my instances are 61-bit numbers, stored in twos complement form. The allowable range is approximately +- 10^18 (+- 1 quintillion). The actual values are computed at start-up. See SmallInteger class startUp:, minVal, maxVal.' + stamp: 'eem 11/20/2014 08:41')]. - comment: 'My instances are 31-bit numbers, stored in twos complement form. The allowable range is approximately +- 1 billion (see SmallInteger minVal, maxVal). My instances are encoded in tagged pointers in the VM, so called immediates, and therefore are pure immutable values.' - stamp: 'eem 8/12/2014 14:54')]. (package includesClass: CompiledMethod) ifTrue: [patches add: (self compiledMethodClassDefinition)]. ^MCPatch operations: patches!

1 0

Fast bitblt in Cog - or rather, not
by tim Rowledge 21 Nov '14

21 Nov '14

Well this is embarrassing. It looks like somewhere in the integration of the fast bitblt ARM stuff the basic init didn’t get moved across from the plain interp code base. I’m trying to work out how that happened and also why it has never caused fatal errors... tim -- tim Rowledge; tim(a)rowledge.org; http://www.rowledge.org/tim Strange OpCodes: SDD: Scratch Disk and Die

1 0

64-bit progress
by Eliot Miranda 20 Nov '14

20 Nov '14

Hi All, I'm pleased to say that today the simulator got as far as redrawing the entire display and finishing the start-up sequence for a bootstrapped 64-bit Spur image. That means it correctly executed over 26 million bytecodes. So at least a 64-bit Spur Stack VM is not too far off. -- best, Eliot

4 3

← Newer
1
...
4
5
6
7
8
9
10
...
17
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

Vm-dev November 2014