<div dir="ltr">Hi Nicolas, Hi All,<div><br></div><div> ugh. Merging with git is simply too confusing. I f**ed up royally and have wasted an afternoon getting merged to change one file. Nicolas, apologies for all the noise. I had started this monong to debug the issue. I discovered it,fixed it, regenerated sources and was about to push when I discovered you had beaten me to it. But since I had committed the regenerated sources (which were mixed with a few others) I had many conflicts with your regeneration. I don't see an easy way of pulling your changes, obliterating my regeneration, while keeping the small set of changes that remained meaningful. It should be easy but I found it horribly time consuming. Anyway, apologies for the bug, for obscuring your commit with my own merge attempts, and for whining.</div><div><br></div><div>If I come here again, what is the simplest way of resolving conflicts such that</div><div>- one has committed many local changes</div><div>- one can pull a version that one wants to displace one's current version on a file-by-file basis</div><div>Why isn't there a pull -merge -take-theirs? How does one construct that?</div></div><div class="gmail_extra"><br><div class="gmail_quote">On Thu, Nov 30, 2017 at 3:03 PM, GitHub <span dir="ltr"><<a href="mailto:noreply@github.com" target="_blank">noreply@github.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"> <br> Branch: refs/heads/Cog<br>
Home: <a href="https://github.com/OpenSmalltalk/opensmalltalk-vm" rel="noreferrer" target="_blank">https://github.com/<wbr>OpenSmalltalk/opensmalltalk-vm</a><br>
Commit: 4a29fb8a59e7a7d484ab04c8acde55<wbr>8beb42baad<br>
<a href="https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/4a29fb8a59e7a7d484ab04c8acde558beb42baad" rel="noreferrer" target="_blank">https://github.com/<wbr>OpenSmalltalk/opensmalltalk-<wbr>vm/commit/<wbr>4a29fb8a59e7a7d484ab04c8acde55<wbr>8beb42baad</a><br>
Author: Eliot Miranda <<a href="mailto:eliot.miranda@gmail.com">eliot.miranda@gmail.com</a>><br>
Date: 2017-11-30 (Thu, 30 Nov 2017)<br>
<br>
Changed paths:<br>
M build.macos32x86/bochsx64/<wbr>makeem<br>
M build.macos32x86/bochsx86/<wbr>makeem<br>
M build.macos32x86/gdbarm32/<wbr>makeem<br>
M build.macos64x64/bochsx64/<wbr>makeem<br>
M build.macos64x64/bochsx86/<wbr>makeem<br>
M build.macos64x64/gdbarm32/<wbr>makeem<br>
M image/Slang Test Workspace.text<br>
M nsspur64src/vm/cogit.h<br>
M nsspur64src/vm/cogitX64SysV.c<br>
M nsspur64src/vm/cogitX64WIN64.c<br>
M nsspur64src/vm/cointerp.c<br>
M nsspur64src/vm/cointerp.h<br>
M nsspur64src/vm/gcc3x-cointerp.<wbr>c<br>
M nsspur64src/vm/interp.h<br>
M nsspursrc/vm/cogit.h<br>
M nsspursrc/vm/cogitARMv5.c<br>
M nsspursrc/vm/cogitIA32.c<br>
M nsspursrc/vm/cogitMIPSEL.c<br>
M nsspursrc/vm/cointerp.c<br>
M nsspursrc/vm/cointerp.h<br>
M nsspursrc/vm/gcc3x-cointerp.c<br>
M nsspursrc/vm/interp.h<br>
M nsspurstack64src/vm/gcc3x-<wbr>interp.c<br>
M nsspurstack64src/vm/interp.c<br>
M nsspurstacksrc/vm/gcc3x-<wbr>interp.c<br>
M nsspurstacksrc/vm/interp.c<br>
M platforms/iOS/plugins/<wbr>CameraPlugin/<wbr>AVFoundationVideoGrabber.m<br>
R platforms/win32/plugins/<wbr>CameraPlugin/cameraOps.h<br>
M platforms/win32/plugins/<wbr>CameraPlugin/winCameraOps.cpp<br>
M spur64src/vm/cogit.h<br>
M spur64src/vm/cogitX64SysV.c<br>
M spur64src/vm/cogitX64WIN64.c<br>
M spur64src/vm/cointerp.c<br>
M spur64src/vm/cointerp.h<br>
M spur64src/vm/gcc3x-cointerp.c<br>
M spurlowcode64src/vm/cogit.h<br>
M spurlowcode64src/vm/<wbr>cogitX64SysV.c<br>
M spurlowcode64src/vm/<wbr>cogitX64WIN64.c<br>
M spurlowcode64src/vm/cointerp.c<br>
M spurlowcode64src/vm/cointerp.h<br>
M spurlowcode64src/vm/gcc3x-<wbr>cointerp.c<br>
M spurlowcodesrc/vm/cogit.h<br>
M spurlowcodesrc/vm/cogitARMv5.c<br>
M spurlowcodesrc/vm/cogitIA32.c<br>
M spurlowcodesrc/vm/cogitMIPSEL.<wbr>c<br>
M spurlowcodesrc/vm/cointerp.c<br>
M spurlowcodesrc/vm/cointerp.h<br>
M spurlowcodesrc/vm/gcc3x-<wbr>cointerp.c<br>
M spurlowcodestack64src/vm/<wbr>gcc3x-interp.c<br>
M spurlowcodestack64src/vm/<wbr>interp.c<br>
M spurlowcodestacksrc/vm/gcc3x-<wbr>interp.c<br>
M spurlowcodestacksrc/vm/interp.<wbr>c<br>
M spursista64src/vm/cogit.h<br>
M spursista64src/vm/<wbr>cogitX64SysV.c<br>
M spursista64src/vm/<wbr>cogitX64WIN64.c<br>
M spursista64src/vm/cointerp.c<br>
M spursista64src/vm/cointerp.h<br>
M spursista64src/vm/gcc3x-<wbr>cointerp.c<br>
M spursistasrc/vm/cogit.h<br>
M spursistasrc/vm/cogitARMv5.c<br>
M spursistasrc/vm/cogitIA32.c<br>
M spursistasrc/vm/cogitMIPSEL.c<br>
M spursistasrc/vm/cointerp.c<br>
M spursistasrc/vm/cointerp.h<br>
M spursistasrc/vm/gcc3x-<wbr>cointerp.c<br>
M spursrc/vm/cogit.h<br>
M spursrc/vm/cogitARMv5.c<br>
M spursrc/vm/cogitIA32.c<br>
M spursrc/vm/cogitMIPSEL.c<br>
M spursrc/vm/cointerp.c<br>
M spursrc/vm/cointerp.h<br>
M spursrc/vm/gcc3x-cointerp.c<br>
M spurstack64src/vm/gcc3x-<wbr>interp.c<br>
M spurstack64src/vm/interp.c<br>
M spurstacksrc/vm/gcc3x-interp.c<br>
M spurstacksrc/vm/interp.c<br>
M src/plugins/B2DPlugin/<wbr>B2DPlugin.c<br>
M src/plugins/<wbr>B3DAcceleratorPlugin/<wbr>B3DAcceleratorPlugin.c<br>
M src/plugins/BitBltPlugin/<wbr>BitBltPlugin.c<br>
M src/plugins/BochsIA32Plugin/<wbr>BochsIA32Plugin.c<br>
M src/plugins/BochsX64Plugin/<wbr>BochsX64Plugin.c<br>
M src/plugins/CroquetPlugin/<wbr>CroquetPlugin.c<br>
M src/plugins/DSAPrims/DSAPrims.<wbr>c<br>
M src/plugins/FFTPlugin/<wbr>FFTPlugin.c<br>
M src/plugins/FilePlugin/<wbr>FilePlugin.c<br>
M src/plugins/FloatArrayPlugin/<wbr>FloatArrayPlugin.c<br>
M src/plugins/GdbARMPlugin/<wbr>GdbARMPlugin.c<br>
M src/plugins/GeniePlugin/<wbr>GeniePlugin.c<br>
M src/plugins/HostWindowPlugin/<wbr>HostWindowPlugin.c<br>
M src/plugins/IA32ABI/IA32ABI.c<br>
M src/plugins/<wbr>JPEGReadWriter2Plugin/<wbr>JPEGReadWriter2Plugin.c<br>
M src/plugins/JPEGReaderPlugin/<wbr>JPEGReaderPlugin.c<br>
M src/plugins/LargeIntegers/<wbr>LargeIntegers.c<br>
M src/plugins/MacMenubarPlugin/<wbr>MacMenubarPlugin.c<br>
M src/plugins/<wbr>MiscPrimitivePlugin/<wbr>MiscPrimitivePlugin.c<br>
M src/plugins/ScratchPlugin/<wbr>ScratchPlugin.c<br>
M src/plugins/SerialPlugin/<wbr>SerialPlugin.c<br>
M src/plugins/SoundPlugin/<wbr>SoundPlugin.c<br>
M src/plugins/Squeak3D/Squeak3D.<wbr>c<br>
M src/plugins/SqueakFFIPrims/<wbr>ARM32FFIPlugin.c<br>
M src/plugins/SqueakFFIPrims/<wbr>IA32FFIPlugin.c<br>
M src/plugins/SqueakFFIPrims/<wbr>X64SysVFFIPlugin.c<br>
M src/plugins/SqueakFFIPrims/<wbr>X64Win64FFIPlugin.c<br>
M src/plugins/<wbr>VMProfileLinuxSupportPlugin/<wbr>VMProfileLinuxSupportPlugin.c<br>
M src/plugins/<wbr>VMProfileMacSupportPlugin/<wbr>VMProfileMacSupportPlugin.c<br>
M src/plugins/<wbr>Win32OSProcessPlugin/<wbr>Win32OSProcessPlugin.c<br>
M src/plugins/<wbr>XDisplayControlPlugin/<wbr>XDisplayControlPlugin.c<br>
M src/plugins/ZipPlugin/<wbr>ZipPlugin.c<br>
M src/vm/cogit.h<br>
M src/vm/cogitARMv5.c<br>
M src/vm/cogitIA32.c<br>
M src/vm/cogitMIPSEL.c<br>
M src/vm/cogmethod.h<br>
M src/vm/cointerp.c<br>
M src/vm/cointerp.h<br>
M src/vm/cointerpmt.c<br>
M src/vm/cointerpmt.h<br>
M src/vm/gcc3x-cointerp.c<br>
M src/vm/gcc3x-cointerpmt.c<br>
M src/vm/interp.h<br>
M stacksrc/vm/gcc3x-interp.c<br>
M stacksrc/vm/interp.c<br>
M stacksrc/vm/interp.h<br>
<br>
Log Message:<br>
-----------<br>
CogVM source as per VMMaker.oscog-eem.2285<br>
<br>
Slang:<br>
Fix sources by backing out of the inlining optimization used in the logging<br>
methods that are now unused. The optmization was careless, not assuming calls<br>
could have side-effects, so in primitiveSubtract the calls to stackIntegerValue<br>
were pushed past the check for primitive failure, and hence<br>
SmallInteger - SmallFloat (in EllipseMidpointTracer>><wbr>stepInY) didn't fail.<br>
<br>
Spur Cogit:<br>
fix primStringReplace in the JIT.<br>
<br>
Plugins:<br>
BitBltSimulation>>copyLoop:<br>
Fix type inference of variable unskew in BitBlt >> copyLoop<br>
Strength reduce the loop split for combinationRule = 3 so that less tests are<br>
done in the inner loop and so trhat when combinstionRule = 3 mergeFn is never<br>
used. Use an explicit type declaration for unskew instead of trickier relying<br>
on type inference. Eliminate bogus use of #== for numeric comparison.<br>
<br>
Fix definitions for CamerPlugin on win32 by nuking bogus intermediate include<br>
file (cameraOps.h), and explicitly on iOS.<br>
<br>
Scripts:<br>
Have the mac makeem scripts for the processor plugins call conf.COG if it<br>
appears not to have been run.<br>
<br>
<br>
Commit: 3124f303c6f03a0af75ffa8cc64dd9<wbr>e2b3ed9d8c<br>
<a href="https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/3124f303c6f03a0af75ffa8cc64dd9e2b3ed9d8c" rel="noreferrer" target="_blank">https://github.com/<wbr>OpenSmalltalk/opensmalltalk-<wbr>vm/commit/<wbr>3124f303c6f03a0af75ffa8cc64dd9<wbr>e2b3ed9d8c</a><br>
Author: Eliot Miranda <<a href="mailto:eliot.miranda@gmail.com">eliot.miranda@gmail.com</a>><br>
Date: 2017-11-30 (Thu, 30 Nov 2017)<br>
<br>
Changed paths:<br>
M nsspur64src/vm/cogit.h<br>
M nsspur64src/vm/cogitX64SysV.c<br>
M nsspur64src/vm/cogitX64WIN64.c<br>
M nsspur64src/vm/cogmethod.h<br>
M nsspur64src/vm/cointerp.c<br>
M nsspur64src/vm/cointerp.h<br>
M nsspur64src/vm/gcc3x-cointerp.<wbr>c<br>
M nsspur64src/vm/interp.h<br>
M nsspur64src/vm/nssendcache.h<br>
M nsspur64src/vm/vmCallback.h<br>
M nsspursrc/vm/cogit.h<br>
M nsspursrc/vm/cogitARMv5.c<br>
M nsspursrc/vm/cogitIA32.c<br>
M nsspursrc/vm/cogitMIPSEL.c<br>
M nsspursrc/vm/cogmethod.h<br>
M nsspursrc/vm/cointerp.c<br>
M nsspursrc/vm/cointerp.h<br>
M nsspursrc/vm/gcc3x-cointerp.c<br>
M nsspursrc/vm/interp.h<br>
M nsspursrc/vm/nssendcache.h<br>
M nsspursrc/vm/vmCallback.h<br>
M nsspurstack64src/vm/gcc3x-<wbr>interp.c<br>
M nsspurstack64src/vm/interp.c<br>
M nsspurstack64src/vm/interp.h<br>
M nsspurstack64src/vm/<wbr>vmCallback.h<br>
M nsspurstacksrc/vm/gcc3x-<wbr>interp.c<br>
M nsspurstacksrc/vm/interp.c<br>
M nsspurstacksrc/vm/interp.h<br>
M nsspurstacksrc/vm/vmCallback.h<br>
M platforms/unix/plugins/<wbr>SqueakSSL/sqUnixOpenSSL.c<br>
M spur64src/vm/cogit.h<br>
M spur64src/vm/cogitX64SysV.c<br>
M spur64src/vm/cogitX64WIN64.c<br>
M spur64src/vm/cogmethod.h<br>
M spur64src/vm/cointerp.c<br>
M spur64src/vm/cointerp.h<br>
M spur64src/vm/gcc3x-cointerp.c<br>
M spur64src/vm/interp.h<br>
M spur64src/vm/vmCallback.h<br>
M spurlowcode64src/vm/cogit.h<br>
M spurlowcode64src/vm/<wbr>cogitX64SysV.c<br>
M spurlowcode64src/vm/<wbr>cogitX64WIN64.c<br>
M spurlowcode64src/vm/cogmethod.<wbr>h<br>
M spurlowcode64src/vm/cointerp.c<br>
M spurlowcode64src/vm/cointerp.h<br>
M spurlowcode64src/vm/gcc3x-<wbr>cointerp.c<br>
M spurlowcode64src/vm/interp.h<br>
M spurlowcode64src/vm/<wbr>vmCallback.h<br>
M spurlowcodesrc/vm/cogit.h<br>
M spurlowcodesrc/vm/cogitARMv5.c<br>
M spurlowcodesrc/vm/cogitIA32.c<br>
M spurlowcodesrc/vm/cogitMIPSEL.<wbr>c<br>
M spurlowcodesrc/vm/cogmethod.h<br>
M spurlowcodesrc/vm/cointerp.c<br>
M spurlowcodesrc/vm/cointerp.h<br>
M spurlowcodesrc/vm/gcc3x-<wbr>cointerp.c<br>
M spurlowcodesrc/vm/interp.h<br>
M spurlowcodesrc/vm/vmCallback.h<br>
M spurlowcodestack64src/vm/<wbr>gcc3x-interp.c<br>
M spurlowcodestack64src/vm/<wbr>interp.c<br>
M spurlowcodestack64src/vm/<wbr>interp.h<br>
M spurlowcodestack64src/vm/<wbr>vmCallback.h<br>
M spurlowcodestacksrc/vm/gcc3x-<wbr>interp.c<br>
M spurlowcodestacksrc/vm/interp.<wbr>c<br>
M spurlowcodestacksrc/vm/interp.<wbr>h<br>
M spurlowcodestacksrc/vm/<wbr>vmCallback.h<br>
M spursista64src/vm/cogit.h<br>
M spursista64src/vm/<wbr>cogitX64SysV.c<br>
M spursista64src/vm/<wbr>cogitX64WIN64.c<br>
M spursista64src/vm/cogmethod.h<br>
M spursista64src/vm/cointerp.c<br>
M spursista64src/vm/cointerp.h<br>
M spursista64src/vm/gcc3x-<wbr>cointerp.c<br>
M spursista64src/vm/interp.h<br>
M spursista64src/vm/vmCallback.h<br>
M spursistasrc/vm/cogit.h<br>
M spursistasrc/vm/cogitARMv5.c<br>
M spursistasrc/vm/cogitIA32.c<br>
M spursistasrc/vm/cogitMIPSEL.c<br>
M spursistasrc/vm/cogmethod.h<br>
M spursistasrc/vm/cointerp.c<br>
M spursistasrc/vm/cointerp.h<br>
M spursistasrc/vm/gcc3x-<wbr>cointerp.c<br>
M spursistasrc/vm/interp.h<br>
M spursistasrc/vm/vmCallback.h<br>
M spursrc/vm/cogit.h<br>
M spursrc/vm/cogitARMv5.c<br>
M spursrc/vm/cogitIA32.c<br>
M spursrc/vm/cogitMIPSEL.c<br>
M spursrc/vm/cogmethod.h<br>
M spursrc/vm/cointerp.c<br>
M spursrc/vm/cointerp.h<br>
M spursrc/vm/gcc3x-cointerp.c<br>
M spursrc/vm/interp.h<br>
M spursrc/vm/vmCallback.h<br>
M spurstack64src/vm/gcc3x-<wbr>interp.c<br>
M spurstack64src/vm/interp.c<br>
M spurstack64src/vm/interp.h<br>
M spurstack64src/vm/vmCallback.h<br>
M spurstacksrc/vm/gcc3x-interp.c<br>
M spurstacksrc/vm/interp.c<br>
M spurstacksrc/vm/interp.h<br>
M spurstacksrc/vm/vmCallback.h<br>
M src/plugins/<wbr>MiscPrimitivePlugin/<wbr>MiscPrimitivePlugin.c<br>
M src/vm/cogit.h<br>
M src/vm/cogitARMv5.c<br>
M src/vm/cogitIA32.c<br>
M src/vm/cogitMIPSEL.c<br>
M src/vm/cogmethod.h<br>
M src/vm/cointerp.c<br>
M src/vm/cointerp.h<br>
M src/vm/cointerpmt.c<br>
M src/vm/cointerpmt.h<br>
M src/vm/gcc3x-cointerp.c<br>
M src/vm/gcc3x-cointerpmt.c<br>
M src/vm/interp.h<br>
M src/vm/vmCallback.h<br>
M stacksrc/vm/gcc3x-interp.c<br>
M stacksrc/vm/interp.c<br>
M stacksrc/vm/interp.h<br>
M stacksrc/vm/vmCallback.h<br>
<br>
Log Message:<br>
-----------<br>
Merge with Nicolas' VMMaker.oscog- nice.2281 regeneration.<br>
<br>
<br>
Commit: a5da5693ed4e9783647846766350c2<wbr>a6fabedecc<br>
<a href="https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/a5da5693ed4e9783647846766350c2a6fabedecc" rel="noreferrer" target="_blank">https://github.com/<wbr>OpenSmalltalk/opensmalltalk-<wbr>vm/commit/<wbr>a5da5693ed4e9783647846766350c2<wbr>a6fabedecc</a><br>
Author: Eliot Miranda <<a href="mailto:eliot.miranda@gmail.com">eliot.miranda@gmail.com</a>><br>
Date: 2017-11-30 (Thu, 30 Nov 2017)<br>
<br>
Changed paths:<br>
M spur64src/vm/cogit.h<br>
M spur64src/vm/cogitX64SysV.c<br>
M spur64src/vm/cogitX64WIN64.c<br>
M spurlowcode64src/vm/cogit.h<br>
M spurlowcode64src/vm/<wbr>cogitX64SysV.c<br>
M spurlowcode64src/vm/<wbr>cogitX64WIN64.c<br>
M spurlowcodesrc/vm/cogit.h<br>
M spurlowcodesrc/vm/cogitARMv5.c<br>
M spurlowcodesrc/vm/cogitIA32.c<br>
M spurlowcodesrc/vm/cogitMIPSEL.<wbr>c<br>
M spursista64src/vm/cogit.h<br>
M spursista64src/vm/<wbr>cogitX64SysV.c<br>
M spursista64src/vm/<wbr>cogitX64WIN64.c<br>
M spursistasrc/vm/cogit.h<br>
M spursistasrc/vm/cogitARMv5.c<br>
M spursistasrc/vm/cogitIA32.c<br>
M spursistasrc/vm/cogitMIPSEL.c<br>
M spursrc/vm/cogit.h<br>
M spursrc/vm/cogitARMv5.c<br>
M spursrc/vm/cogitIA32.c<br>
M spursrc/vm/cogitMIPSEL.c<br>
<br>
Log Message:<br>
-----------<br>
Merge with Nicolas' VMMaker.oscog- nice.2281 generation.<br>
<br>
<br>
Commit: 8de3e4aa1f87eab4a7ce28ae3e0880<wbr>ae4dac177f<br>
<a href="https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/8de3e4aa1f87eab4a7ce28ae3e0880ae4dac177f" rel="noreferrer" target="_blank">https://github.com/<wbr>OpenSmalltalk/opensmalltalk-<wbr>vm/commit/<wbr>8de3e4aa1f87eab4a7ce28ae3e0880<wbr>ae4dac177f</a><br>
Author: Eliot Miranda <<a href="mailto:eliot.miranda@gmail.com">eliot.miranda@gmail.com</a>><br>
Date: 2017-11-30 (Thu, 30 Nov 2017)<br>
<br>
Changed paths:<br>
M src/plugins/BitBltPlugin/<wbr>BitBltPlugin.c<br>
<br>
Log Message:<br>
-----------<br>
Merge with Nicolas' VMMaker.oscog- nice.2281 generation.<br>
<br>
<br>
Commit: f590af1093325c7ddb5af03c41ea77<wbr>5bf3158510<br>
<a href="https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/f590af1093325c7ddb5af03c41ea775bf3158510" rel="noreferrer" target="_blank">https://github.com/<wbr>OpenSmalltalk/opensmalltalk-<wbr>vm/commit/<wbr>f590af1093325c7ddb5af03c41ea77<wbr>5bf3158510</a><br>
Author: Eliot Miranda <<a href="mailto:eliot.miranda@gmail.com">eliot.miranda@gmail.com</a>><br>
Date: 2017-11-30 (Thu, 30 Nov 2017)<br>
<br>
Log Message:<br>
-----------<br>
Merge branch 'Cog' of <a href="https://github.com/OpenSmalltalk/opensmalltalk-vm" rel="noreferrer" target="_blank">https://github.com/<wbr>OpenSmalltalk/opensmalltalk-vm</a> into Cog<br>
Merge with Nicolas' VMMaker.oscog- nice.2281 generation.<br>
<br>
<br>
Commit: 106fdde6feb856e172ac6f59d33d03<wbr>3a6da34531<br>
<a href="https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/106fdde6feb856e172ac6f59d33d033a6da34531" rel="noreferrer" target="_blank">https://github.com/<wbr>OpenSmalltalk/opensmalltalk-<wbr>vm/commit/<wbr>106fdde6feb856e172ac6f59d33d03<wbr>3a6da34531</a><br>
Author: Eliot Miranda <<a href="mailto:eliot.miranda@gmail.com">eliot.miranda@gmail.com</a>><br>
Date: 2017-11-30 (Thu, 30 Nov 2017)<br>
<br>
Changed paths:<br>
M src/plugins/BitBltPlugin/<wbr>BitBltPlugin.c<br>
<br>
Log Message:<br>
-----------<br>
BitBltPlugin as per VMMaker.oscog-eem.2285<br>
BitBltSimulation>>copyLoop:<br>
Fix type inference of variable unskew in BitBlt >> copyLoop<br>
Strength reduce the loop split for combinationRule = 3 so that less tests are<br>
done in the inner loop and so trhat when combinstionRule = 3 mergeFn is never<br>
used. Use an explicit type declaration for unskew instead of trickier relying<br>
on type inference<br>
<br>
<br>
Compare: <a href="https://github.com/OpenSmalltalk/opensmalltalk-vm/compare/8879e2e55826...106fdde6feb8" rel="noreferrer" target="_blank">https://github.com/<wbr>OpenSmalltalk/opensmalltalk-<wbr>vm/compare/8879e2e55826...<wbr>106fdde6feb8</a><br></blockquote></div><br><br clear="all"><div><br></div>-- <br><div class="gmail_signature" data-smartmail="gmail_signature"><div dir="ltr"><div><span style="font-size:small;border-collapse:separate"><div>_,,,^..^,,,_<br></div><div>best, Eliot</div></span></div></div></div>
</div>