Hi LGB,
Firstly, I like to watch the "Network Graph" as it graphically shows the changes to branches and etc.
https://github.com/MEGA65/mega65-core/networkSecondly, the only change between "development" and "spdelay2" is shown by clicking the HEAD of "spdelay2" on "the Network Graph".
https://github.com/MEGA65/mega65-core/commit/dec4f30370a6dcc3d5bcf50de29e195647080ccdAs the above link shows, I have just removed the 'delay'-code and modified the comment to reflect this.
So, until the above change in 'spdelay2' is merged back into an upstream-branch, yes, there is fear that it will never be merged and the EMU will be using a stale/special KS from an unactive branch.
One option is that I could merge the 'spdelay2' branch into the 'development' or 'master', but I am not ready to do that. This is because I have not updated the VHDL to reflect the change in delay signalling, more particular I have not correctly wired the serial-port-status-signal back to the cpu, my work is currently in the "serialportdelay" branch. Paul has suggested an alternate mechanism, which I am yet to implement.
I have just quickly removed the delay in the 'spdelay2' branch because others are now using the XEMU for further development purposes. They do not need to compile the VHDL and use the Nexys board.
We need to keep the VHDL and ASM (ie KICKSTART) in sync, especially for the 'master' and 'development' branches. Currently all branches are in sync except for the 'serialportdelay' and 'spdelay2' branches. These later two are a work in progress.
Short answer, I would embed into XEMU the KS from the 'spdelay2' branch, for now.
What do you think about your XEMU compile process to check to see if there is a "./../mega65-core" directory, and if so, then your makefile calls "./../mega65-core/src/make firmware" to generate the KS of whatever branch the user has in their $GIT_ROOT$ directory?
Yes, the EMU is now quite speedy compared to when the EMU had to emulate the delay.
Ben.