<html><head><meta http-equiv="Content-Type" content="text/html charset=us-ascii"></head><body style="word-wrap: break-word; -webkit-nbsp-mode: space; -webkit-line-break: after-white-space;" class=""><div class="">Lots of ways to skin this cat.</div><div class=""><br class=""></div><div class="">You should always work in a branch, then do pull requests back to master (or whatever branch you want to designate as "official").</div><div class=""><br class=""></div><div class="">If you attempt a merge and it gets ugly</div><div class=""><br class=""></div><div class="">>git merge --abort<br class=""></div><div class=""><br class=""></div><div class="">should put you back to where you were.</div><div class=""><br class=""></div><div class="">>git checkout <version-id> filename</div><div class=""><br class=""></div><div class="">would let you grab the non merged file from the other committer into your workspace.</div><div class=""><br class=""></div><div class="">git is an incredibly powerful but can be insanely frustrating until you get your a-ha moment.</div><div class=""><br class=""></div><div class="">If you start making a bunch of changes and realize that you might want to get back to where you started - kick off a new branch with</div><div class=""><br class=""></div><div class="">>git checkout -b newbranchname</div><div class=""><br class=""></div><div class=""><br class=""></div><div class=""><br class=""><div><blockquote type="cite" class=""><div class="">On Nov 30, 2017, at 3:14 PM, Eliot Miranda <<a href="mailto:eliot.miranda@gmail.com" class="">eliot.miranda@gmail.com</a>> wrote:</div><br class="Apple-interchange-newline"><div class=""><div dir="ltr" class="">Hi Nicolas, Hi All,<div class=""><br class=""></div><div class=""> 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 class=""><br class=""></div><div class="">If I come here again, what is the simplest way of resolving conflicts such that</div><div class="">- one has committed many local changes</div><div class="">- one can pull a version that one wants to displace one's current version on a file-by-file basis</div><div class="">Why isn't there a pull -merge -take-theirs? How does one construct that?</div></div><div class="gmail_extra"><br class=""><div class="gmail_quote">On Thu, Nov 30, 2017 at 3:03 PM, GitHub <span dir="ltr" class=""><<a href="mailto:noreply@github.com" target="_blank" class="">noreply@github.com</a>></span> wrote:<br class=""><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"> <br class=""> Branch: refs/heads/Cog<br class="">
Home: <a href="https://github.com/OpenSmalltalk/opensmalltalk-vm" rel="noreferrer" target="_blank" class="">https://github.com/<wbr class="">OpenSmalltalk/opensmalltalk-vm</a><br class="">
Commit: 4a29fb8a59e7a7d484ab04c8acde55<wbr class="">8beb42baad<br class="">
<a href="https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/4a29fb8a59e7a7d484ab04c8acde558beb42baad" rel="noreferrer" target="_blank" class="">https://github.com/<wbr class="">OpenSmalltalk/opensmalltalk-<wbr class="">vm/commit/<wbr class="">4a29fb8a59e7a7d484ab04c8acde55<wbr class="">8beb42baad</a><br class="">
Author: Eliot Miranda <<a href="mailto:eliot.miranda@gmail.com" class="">eliot.miranda@gmail.com</a>><br class="">
Date: 2017-11-30 (Thu, 30 Nov 2017)<br class="">
<br class="">
Changed paths:<br class="">
M build.macos32x86/bochsx64/<wbr class="">makeem<br class="">
M build.macos32x86/bochsx86/<wbr class="">makeem<br class="">
M build.macos32x86/gdbarm32/<wbr class="">makeem<br class="">
M build.macos64x64/bochsx64/<wbr class="">makeem<br class="">
M build.macos64x64/bochsx86/<wbr class="">makeem<br class="">
M build.macos64x64/gdbarm32/<wbr class="">makeem<br class="">
M image/Slang Test Workspace.text<br class="">
M nsspur64src/vm/cogit.h<br class="">
M nsspur64src/vm/cogitX64SysV.c<br class="">
M nsspur64src/vm/cogitX64WIN64.c<br class="">
M nsspur64src/vm/cointerp.c<br class="">
M nsspur64src/vm/cointerp.h<br class="">
M nsspur64src/vm/gcc3x-cointerp.<wbr class="">c<br class="">
M nsspur64src/vm/interp.h<br class="">
M nsspursrc/vm/cogit.h<br class="">
M nsspursrc/vm/cogitARMv5.c<br class="">
M nsspursrc/vm/cogitIA32.c<br class="">
M nsspursrc/vm/cogitMIPSEL.c<br class="">
M nsspursrc/vm/cointerp.c<br class="">
M nsspursrc/vm/cointerp.h<br class="">
M nsspursrc/vm/gcc3x-cointerp.c<br class="">
M nsspursrc/vm/interp.h<br class="">
M nsspurstack64src/vm/gcc3x-<wbr class="">interp.c<br class="">
M nsspurstack64src/vm/interp.c<br class="">
M nsspurstacksrc/vm/gcc3x-<wbr class="">interp.c<br class="">
M nsspurstacksrc/vm/interp.c<br class="">
M platforms/iOS/plugins/<wbr class="">CameraPlugin/<wbr class="">AVFoundationVideoGrabber.m<br class="">
R platforms/win32/plugins/<wbr class="">CameraPlugin/cameraOps.h<br class="">
M platforms/win32/plugins/<wbr class="">CameraPlugin/winCameraOps.cpp<br class="">
M spur64src/vm/cogit.h<br class="">
M spur64src/vm/cogitX64SysV.c<br class="">
M spur64src/vm/cogitX64WIN64.c<br class="">
M spur64src/vm/cointerp.c<br class="">
M spur64src/vm/cointerp.h<br class="">
M spur64src/vm/gcc3x-cointerp.c<br class="">
M spurlowcode64src/vm/cogit.h<br class="">
M spurlowcode64src/vm/<wbr class="">cogitX64SysV.c<br class="">
M spurlowcode64src/vm/<wbr class="">cogitX64WIN64.c<br class="">
M spurlowcode64src/vm/cointerp.c<br class="">
M spurlowcode64src/vm/cointerp.h<br class="">
M spurlowcode64src/vm/gcc3x-<wbr class="">cointerp.c<br class="">
M spurlowcodesrc/vm/cogit.h<br class="">
M spurlowcodesrc/vm/cogitARMv5.c<br class="">
M spurlowcodesrc/vm/cogitIA32.c<br class="">
M spurlowcodesrc/vm/cogitMIPSEL.<wbr class="">c<br class="">
M spurlowcodesrc/vm/cointerp.c<br class="">
M spurlowcodesrc/vm/cointerp.h<br class="">
M spurlowcodesrc/vm/gcc3x-<wbr class="">cointerp.c<br class="">
M spurlowcodestack64src/vm/<wbr class="">gcc3x-interp.c<br class="">
M spurlowcodestack64src/vm/<wbr class="">interp.c<br class="">
M spurlowcodestacksrc/vm/gcc3x-<wbr class="">interp.c<br class="">
M spurlowcodestacksrc/vm/interp.<wbr class="">c<br class="">
M spursista64src/vm/cogit.h<br class="">
M spursista64src/vm/<wbr class="">cogitX64SysV.c<br class="">
M spursista64src/vm/<wbr class="">cogitX64WIN64.c<br class="">
M spursista64src/vm/cointerp.c<br class="">
M spursista64src/vm/cointerp.h<br class="">
M spursista64src/vm/gcc3x-<wbr class="">cointerp.c<br class="">
M spursistasrc/vm/cogit.h<br class="">
M spursistasrc/vm/cogitARMv5.c<br class="">
M spursistasrc/vm/cogitIA32.c<br class="">
M spursistasrc/vm/cogitMIPSEL.c<br class="">
M spursistasrc/vm/cointerp.c<br class="">
M spursistasrc/vm/cointerp.h<br class="">
M spursistasrc/vm/gcc3x-<wbr class="">cointerp.c<br class="">
M spursrc/vm/cogit.h<br class="">
M spursrc/vm/cogitARMv5.c<br class="">
M spursrc/vm/cogitIA32.c<br class="">
M spursrc/vm/cogitMIPSEL.c<br class="">
M spursrc/vm/cointerp.c<br class="">
M spursrc/vm/cointerp.h<br class="">
M spursrc/vm/gcc3x-cointerp.c<br class="">
M spurstack64src/vm/gcc3x-<wbr class="">interp.c<br class="">
M spurstack64src/vm/interp.c<br class="">
M spurstacksrc/vm/gcc3x-interp.c<br class="">
M spurstacksrc/vm/interp.c<br class="">
M src/plugins/B2DPlugin/<wbr class="">B2DPlugin.c<br class="">
M src/plugins/<wbr class="">B3DAcceleratorPlugin/<wbr class="">B3DAcceleratorPlugin.c<br class="">
M src/plugins/BitBltPlugin/<wbr class="">BitBltPlugin.c<br class="">
M src/plugins/BochsIA32Plugin/<wbr class="">BochsIA32Plugin.c<br class="">
M src/plugins/BochsX64Plugin/<wbr class="">BochsX64Plugin.c<br class="">
M src/plugins/CroquetPlugin/<wbr class="">CroquetPlugin.c<br class="">
M src/plugins/DSAPrims/DSAPrims.<wbr class="">c<br class="">
M src/plugins/FFTPlugin/<wbr class="">FFTPlugin.c<br class="">
M src/plugins/FilePlugin/<wbr class="">FilePlugin.c<br class="">
M src/plugins/FloatArrayPlugin/<wbr class="">FloatArrayPlugin.c<br class="">
M src/plugins/GdbARMPlugin/<wbr class="">GdbARMPlugin.c<br class="">
M src/plugins/GeniePlugin/<wbr class="">GeniePlugin.c<br class="">
M src/plugins/HostWindowPlugin/<wbr class="">HostWindowPlugin.c<br class="">
M src/plugins/IA32ABI/IA32ABI.c<br class="">
M src/plugins/<wbr class="">JPEGReadWriter2Plugin/<wbr class="">JPEGReadWriter2Plugin.c<br class="">
M src/plugins/JPEGReaderPlugin/<wbr class="">JPEGReaderPlugin.c<br class="">
M src/plugins/LargeIntegers/<wbr class="">LargeIntegers.c<br class="">
M src/plugins/MacMenubarPlugin/<wbr class="">MacMenubarPlugin.c<br class="">
M src/plugins/<wbr class="">MiscPrimitivePlugin/<wbr class="">MiscPrimitivePlugin.c<br class="">
M src/plugins/ScratchPlugin/<wbr class="">ScratchPlugin.c<br class="">
M src/plugins/SerialPlugin/<wbr class="">SerialPlugin.c<br class="">
M src/plugins/SoundPlugin/<wbr class="">SoundPlugin.c<br class="">
M src/plugins/Squeak3D/Squeak3D.<wbr class="">c<br class="">
M src/plugins/SqueakFFIPrims/<wbr class="">ARM32FFIPlugin.c<br class="">
M src/plugins/SqueakFFIPrims/<wbr class="">IA32FFIPlugin.c<br class="">
M src/plugins/SqueakFFIPrims/<wbr class="">X64SysVFFIPlugin.c<br class="">
M src/plugins/SqueakFFIPrims/<wbr class="">X64Win64FFIPlugin.c<br class="">
M src/plugins/<wbr class="">VMProfileLinuxSupportPlugin/<wbr class="">VMProfileLinuxSupportPlugin.c<br class="">
M src/plugins/<wbr class="">VMProfileMacSupportPlugin/<wbr class="">VMProfileMacSupportPlugin.c<br class="">
M src/plugins/<wbr class="">Win32OSProcessPlugin/<wbr class="">Win32OSProcessPlugin.c<br class="">
M src/plugins/<wbr class="">XDisplayControlPlugin/<wbr class="">XDisplayControlPlugin.c<br class="">
M src/plugins/ZipPlugin/<wbr class="">ZipPlugin.c<br class="">
M src/vm/cogit.h<br class="">
M src/vm/cogitARMv5.c<br class="">
M src/vm/cogitIA32.c<br class="">
M src/vm/cogitMIPSEL.c<br class="">
M src/vm/cogmethod.h<br class="">
M src/vm/cointerp.c<br class="">
M src/vm/cointerp.h<br class="">
M src/vm/cointerpmt.c<br class="">
M src/vm/cointerpmt.h<br class="">
M src/vm/gcc3x-cointerp.c<br class="">
M src/vm/gcc3x-cointerpmt.c<br class="">
M src/vm/interp.h<br class="">
M stacksrc/vm/gcc3x-interp.c<br class="">
M stacksrc/vm/interp.c<br class="">
M stacksrc/vm/interp.h<br class="">
<br class="">
Log Message:<br class="">
-----------<br class="">
CogVM source as per VMMaker.oscog-eem.2285<br class="">
<br class="">
Slang:<br class="">
Fix sources by backing out of the inlining optimization used in the logging<br class="">
methods that are now unused. The optmization was careless, not assuming calls<br class="">
could have side-effects, so in primitiveSubtract the calls to stackIntegerValue<br class="">
were pushed past the check for primitive failure, and hence<br class="">
SmallInteger - SmallFloat (in EllipseMidpointTracer>><wbr class="">stepInY) didn't fail.<br class="">
<br class="">
Spur Cogit:<br class="">
fix primStringReplace in the JIT.<br class="">
<br class="">
Plugins:<br class="">
BitBltSimulation>>copyLoop:<br class="">
Fix type inference of variable unskew in BitBlt >> copyLoop<br class="">
Strength reduce the loop split for combinationRule = 3 so that less tests are<br class="">
done in the inner loop and so trhat when combinstionRule = 3 mergeFn is never<br class="">
used. Use an explicit type declaration for unskew instead of trickier relying<br class="">
on type inference. Eliminate bogus use of #== for numeric comparison.<br class="">
<br class="">
Fix definitions for CamerPlugin on win32 by nuking bogus intermediate include<br class="">
file (cameraOps.h), and explicitly on iOS.<br class="">
<br class="">
Scripts:<br class="">
Have the mac makeem scripts for the processor plugins call conf.COG if it<br class="">
appears not to have been run.<br class="">
<br class="">
<br class="">
Commit: 3124f303c6f03a0af75ffa8cc64dd9<wbr class="">e2b3ed9d8c<br class="">
<a href="https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/3124f303c6f03a0af75ffa8cc64dd9e2b3ed9d8c" rel="noreferrer" target="_blank" class="">https://github.com/<wbr class="">OpenSmalltalk/opensmalltalk-<wbr class="">vm/commit/<wbr class="">3124f303c6f03a0af75ffa8cc64dd9<wbr class="">e2b3ed9d8c</a><br class="">
Author: Eliot Miranda <<a href="mailto:eliot.miranda@gmail.com" class="">eliot.miranda@gmail.com</a>><br class="">
Date: 2017-11-30 (Thu, 30 Nov 2017)<br class="">
<br class="">
Changed paths:<br class="">
M nsspur64src/vm/cogit.h<br class="">
M nsspur64src/vm/cogitX64SysV.c<br class="">
M nsspur64src/vm/cogitX64WIN64.c<br class="">
M nsspur64src/vm/cogmethod.h<br class="">
M nsspur64src/vm/cointerp.c<br class="">
M nsspur64src/vm/cointerp.h<br class="">
M nsspur64src/vm/gcc3x-cointerp.<wbr class="">c<br class="">
M nsspur64src/vm/interp.h<br class="">
M nsspur64src/vm/nssendcache.h<br class="">
M nsspur64src/vm/vmCallback.h<br class="">
M nsspursrc/vm/cogit.h<br class="">
M nsspursrc/vm/cogitARMv5.c<br class="">
M nsspursrc/vm/cogitIA32.c<br class="">
M nsspursrc/vm/cogitMIPSEL.c<br class="">
M nsspursrc/vm/cogmethod.h<br class="">
M nsspursrc/vm/cointerp.c<br class="">
M nsspursrc/vm/cointerp.h<br class="">
M nsspursrc/vm/gcc3x-cointerp.c<br class="">
M nsspursrc/vm/interp.h<br class="">
M nsspursrc/vm/nssendcache.h<br class="">
M nsspursrc/vm/vmCallback.h<br class="">
M nsspurstack64src/vm/gcc3x-<wbr class="">interp.c<br class="">
M nsspurstack64src/vm/interp.c<br class="">
M nsspurstack64src/vm/interp.h<br class="">
M nsspurstack64src/vm/<wbr class="">vmCallback.h<br class="">
M nsspurstacksrc/vm/gcc3x-<wbr class="">interp.c<br class="">
M nsspurstacksrc/vm/interp.c<br class="">
M nsspurstacksrc/vm/interp.h<br class="">
M nsspurstacksrc/vm/vmCallback.h<br class="">
M platforms/unix/plugins/<wbr class="">SqueakSSL/sqUnixOpenSSL.c<br class="">
M spur64src/vm/cogit.h<br class="">
M spur64src/vm/cogitX64SysV.c<br class="">
M spur64src/vm/cogitX64WIN64.c<br class="">
M spur64src/vm/cogmethod.h<br class="">
M spur64src/vm/cointerp.c<br class="">
M spur64src/vm/cointerp.h<br class="">
M spur64src/vm/gcc3x-cointerp.c<br class="">
M spur64src/vm/interp.h<br class="">
M spur64src/vm/vmCallback.h<br class="">
M spurlowcode64src/vm/cogit.h<br class="">
M spurlowcode64src/vm/<wbr class="">cogitX64SysV.c<br class="">
M spurlowcode64src/vm/<wbr class="">cogitX64WIN64.c<br class="">
M spurlowcode64src/vm/cogmethod.<wbr class="">h<br class="">
M spurlowcode64src/vm/cointerp.c<br class="">
M spurlowcode64src/vm/cointerp.h<br class="">
M spurlowcode64src/vm/gcc3x-<wbr class="">cointerp.c<br class="">
M spurlowcode64src/vm/interp.h<br class="">
M spurlowcode64src/vm/<wbr class="">vmCallback.h<br class="">
M spurlowcodesrc/vm/cogit.h<br class="">
M spurlowcodesrc/vm/cogitARMv5.c<br class="">
M spurlowcodesrc/vm/cogitIA32.c<br class="">
M spurlowcodesrc/vm/cogitMIPSEL.<wbr class="">c<br class="">
M spurlowcodesrc/vm/cogmethod.h<br class="">
M spurlowcodesrc/vm/cointerp.c<br class="">
M spurlowcodesrc/vm/cointerp.h<br class="">
M spurlowcodesrc/vm/gcc3x-<wbr class="">cointerp.c<br class="">
M spurlowcodesrc/vm/interp.h<br class="">
M spurlowcodesrc/vm/vmCallback.h<br class="">
M spurlowcodestack64src/vm/<wbr class="">gcc3x-interp.c<br class="">
M spurlowcodestack64src/vm/<wbr class="">interp.c<br class="">
M spurlowcodestack64src/vm/<wbr class="">interp.h<br class="">
M spurlowcodestack64src/vm/<wbr class="">vmCallback.h<br class="">
M spurlowcodestacksrc/vm/gcc3x-<wbr class="">interp.c<br class="">
M spurlowcodestacksrc/vm/interp.<wbr class="">c<br class="">
M spurlowcodestacksrc/vm/interp.<wbr class="">h<br class="">
M spurlowcodestacksrc/vm/<wbr class="">vmCallback.h<br class="">
M spursista64src/vm/cogit.h<br class="">
M spursista64src/vm/<wbr class="">cogitX64SysV.c<br class="">
M spursista64src/vm/<wbr class="">cogitX64WIN64.c<br class="">
M spursista64src/vm/cogmethod.h<br class="">
M spursista64src/vm/cointerp.c<br class="">
M spursista64src/vm/cointerp.h<br class="">
M spursista64src/vm/gcc3x-<wbr class="">cointerp.c<br class="">
M spursista64src/vm/interp.h<br class="">
M spursista64src/vm/vmCallback.h<br class="">
M spursistasrc/vm/cogit.h<br class="">
M spursistasrc/vm/cogitARMv5.c<br class="">
M spursistasrc/vm/cogitIA32.c<br class="">
M spursistasrc/vm/cogitMIPSEL.c<br class="">
M spursistasrc/vm/cogmethod.h<br class="">
M spursistasrc/vm/cointerp.c<br class="">
M spursistasrc/vm/cointerp.h<br class="">
M spursistasrc/vm/gcc3x-<wbr class="">cointerp.c<br class="">
M spursistasrc/vm/interp.h<br class="">
M spursistasrc/vm/vmCallback.h<br class="">
M spursrc/vm/cogit.h<br class="">
M spursrc/vm/cogitARMv5.c<br class="">
M spursrc/vm/cogitIA32.c<br class="">
M spursrc/vm/cogitMIPSEL.c<br class="">
M spursrc/vm/cogmethod.h<br class="">
M spursrc/vm/cointerp.c<br class="">
M spursrc/vm/cointerp.h<br class="">
M spursrc/vm/gcc3x-cointerp.c<br class="">
M spursrc/vm/interp.h<br class="">
M spursrc/vm/vmCallback.h<br class="">
M spurstack64src/vm/gcc3x-<wbr class="">interp.c<br class="">
M spurstack64src/vm/interp.c<br class="">
M spurstack64src/vm/interp.h<br class="">
M spurstack64src/vm/vmCallback.h<br class="">
M spurstacksrc/vm/gcc3x-interp.c<br class="">
M spurstacksrc/vm/interp.c<br class="">
M spurstacksrc/vm/interp.h<br class="">
M spurstacksrc/vm/vmCallback.h<br class="">
M src/plugins/<wbr class="">MiscPrimitivePlugin/<wbr class="">MiscPrimitivePlugin.c<br class="">
M src/vm/cogit.h<br class="">
M src/vm/cogitARMv5.c<br class="">
M src/vm/cogitIA32.c<br class="">
M src/vm/cogitMIPSEL.c<br class="">
M src/vm/cogmethod.h<br class="">
M src/vm/cointerp.c<br class="">
M src/vm/cointerp.h<br class="">
M src/vm/cointerpmt.c<br class="">
M src/vm/cointerpmt.h<br class="">
M src/vm/gcc3x-cointerp.c<br class="">
M src/vm/gcc3x-cointerpmt.c<br class="">
M src/vm/interp.h<br class="">
M src/vm/vmCallback.h<br class="">
M stacksrc/vm/gcc3x-interp.c<br class="">
M stacksrc/vm/interp.c<br class="">
M stacksrc/vm/interp.h<br class="">
M stacksrc/vm/vmCallback.h<br class="">
<br class="">
Log Message:<br class="">
-----------<br class="">
Merge with Nicolas' VMMaker.oscog- nice.2281 regeneration.<br class="">
<br class="">
<br class="">
Commit: a5da5693ed4e9783647846766350c2<wbr class="">a6fabedecc<br class="">
<a href="https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/a5da5693ed4e9783647846766350c2a6fabedecc" rel="noreferrer" target="_blank" class="">https://github.com/<wbr class="">OpenSmalltalk/opensmalltalk-<wbr class="">vm/commit/<wbr class="">a5da5693ed4e9783647846766350c2<wbr class="">a6fabedecc</a><br class="">
Author: Eliot Miranda <<a href="mailto:eliot.miranda@gmail.com" class="">eliot.miranda@gmail.com</a>><br class="">
Date: 2017-11-30 (Thu, 30 Nov 2017)<br class="">
<br class="">
Changed paths:<br class="">
M spur64src/vm/cogit.h<br class="">
M spur64src/vm/cogitX64SysV.c<br class="">
M spur64src/vm/cogitX64WIN64.c<br class="">
M spurlowcode64src/vm/cogit.h<br class="">
M spurlowcode64src/vm/<wbr class="">cogitX64SysV.c<br class="">
M spurlowcode64src/vm/<wbr class="">cogitX64WIN64.c<br class="">
M spurlowcodesrc/vm/cogit.h<br class="">
M spurlowcodesrc/vm/cogitARMv5.c<br class="">
M spurlowcodesrc/vm/cogitIA32.c<br class="">
M spurlowcodesrc/vm/cogitMIPSEL.<wbr class="">c<br class="">
M spursista64src/vm/cogit.h<br class="">
M spursista64src/vm/<wbr class="">cogitX64SysV.c<br class="">
M spursista64src/vm/<wbr class="">cogitX64WIN64.c<br class="">
M spursistasrc/vm/cogit.h<br class="">
M spursistasrc/vm/cogitARMv5.c<br class="">
M spursistasrc/vm/cogitIA32.c<br class="">
M spursistasrc/vm/cogitMIPSEL.c<br class="">
M spursrc/vm/cogit.h<br class="">
M spursrc/vm/cogitARMv5.c<br class="">
M spursrc/vm/cogitIA32.c<br class="">
M spursrc/vm/cogitMIPSEL.c<br class="">
<br class="">
Log Message:<br class="">
-----------<br class="">
Merge with Nicolas' VMMaker.oscog- nice.2281 generation.<br class="">
<br class="">
<br class="">
Commit: 8de3e4aa1f87eab4a7ce28ae3e0880<wbr class="">ae4dac177f<br class="">
<a href="https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/8de3e4aa1f87eab4a7ce28ae3e0880ae4dac177f" rel="noreferrer" target="_blank" class="">https://github.com/<wbr class="">OpenSmalltalk/opensmalltalk-<wbr class="">vm/commit/<wbr class="">8de3e4aa1f87eab4a7ce28ae3e0880<wbr class="">ae4dac177f</a><br class="">
Author: Eliot Miranda <<a href="mailto:eliot.miranda@gmail.com" class="">eliot.miranda@gmail.com</a>><br class="">
Date: 2017-11-30 (Thu, 30 Nov 2017)<br class="">
<br class="">
Changed paths:<br class="">
M src/plugins/BitBltPlugin/<wbr class="">BitBltPlugin.c<br class="">
<br class="">
Log Message:<br class="">
-----------<br class="">
Merge with Nicolas' VMMaker.oscog- nice.2281 generation.<br class="">
<br class="">
<br class="">
Commit: f590af1093325c7ddb5af03c41ea77<wbr class="">5bf3158510<br class="">
<a href="https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/f590af1093325c7ddb5af03c41ea775bf3158510" rel="noreferrer" target="_blank" class="">https://github.com/<wbr class="">OpenSmalltalk/opensmalltalk-<wbr class="">vm/commit/<wbr class="">f590af1093325c7ddb5af03c41ea77<wbr class="">5bf3158510</a><br class="">
Author: Eliot Miranda <<a href="mailto:eliot.miranda@gmail.com" class="">eliot.miranda@gmail.com</a>><br class="">
Date: 2017-11-30 (Thu, 30 Nov 2017)<br class="">
<br class="">
Log Message:<br class="">
-----------<br class="">
Merge branch 'Cog' of <a href="https://github.com/OpenSmalltalk/opensmalltalk-vm" rel="noreferrer" target="_blank" class="">https://github.com/<wbr class="">OpenSmalltalk/opensmalltalk-vm</a> into Cog<br class="">
Merge with Nicolas' VMMaker.oscog- nice.2281 generation.<br class="">
<br class="">
<br class="">
Commit: 106fdde6feb856e172ac6f59d33d03<wbr class="">3a6da34531<br class="">
<a href="https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/106fdde6feb856e172ac6f59d33d033a6da34531" rel="noreferrer" target="_blank" class="">https://github.com/<wbr class="">OpenSmalltalk/opensmalltalk-<wbr class="">vm/commit/<wbr class="">106fdde6feb856e172ac6f59d33d03<wbr class="">3a6da34531</a><br class="">
Author: Eliot Miranda <<a href="mailto:eliot.miranda@gmail.com" class="">eliot.miranda@gmail.com</a>><br class="">
Date: 2017-11-30 (Thu, 30 Nov 2017)<br class="">
<br class="">
Changed paths:<br class="">
M src/plugins/BitBltPlugin/<wbr class="">BitBltPlugin.c<br class="">
<br class="">
Log Message:<br class="">
-----------<br class="">
BitBltPlugin as per VMMaker.oscog-eem.2285<br class="">
BitBltSimulation>>copyLoop:<br class="">
Fix type inference of variable unskew in BitBlt >> copyLoop<br class="">
Strength reduce the loop split for combinationRule = 3 so that less tests are<br class="">
done in the inner loop and so trhat when combinstionRule = 3 mergeFn is never<br class="">
used. Use an explicit type declaration for unskew instead of trickier relying<br class="">
on type inference<br class="">
<br class="">
<br class="">
Compare: <a href="https://github.com/OpenSmalltalk/opensmalltalk-vm/compare/8879e2e55826...106fdde6feb8" rel="noreferrer" target="_blank" class="">https://github.com/<wbr class="">OpenSmalltalk/opensmalltalk-<wbr class="">vm/compare/8879e2e55826...<wbr class="">106fdde6feb8</a><br class=""></blockquote></div><br class=""><br clear="all" class=""><div class=""><br class=""></div>-- <br class=""><div class="gmail_signature" data-smartmail="gmail_signature"><div dir="ltr" class=""><div class=""><span style="font-size:small;border-collapse:separate" class=""><div class="">_,,,^..^,,,_<br class=""></div><div class="">best, Eliot</div></span></div></div></div>
</div>
</div></blockquote></div><br class=""></div></body></html>