Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merge dev branch down to main. #165

Merged
merged 292 commits into from
Mar 1, 2025
Merged

Merge dev branch down to main. #165

merged 292 commits into from
Mar 1, 2025

Conversation

dbalsom
Copy link
Owner

@dbalsom dbalsom commented Mar 1, 2025

Let's make main the active branch again and keep dev branches per feature being worked on, instead of version branches

dbalsom and others added 30 commits April 28, 2024 11:18
@dbalsom
Rewrite 8088 BIU for 7-cycle bus access time
2335193
@dbalsom
Rewrite 8088 BIU for 7-cycle bus access time
90261f6
@dbalsom
Rewrite 8088 BIU for 7-cycle bus access time
c4a99c9
@dbalsom
Merge remote-tracking branch 'origin/7_cycle_biu' into 7_cycle_biu
2907e8e
@dbalsom
replace SegmentOverride with Option<Segment>
a05a41f
@dbalsom
more concise, remove segment_override()
b36b18b
@dbalsom
add decode table
6cb1d6c
@dbalsom
implement table-based decode
f7e3ae8
@dbalsom
Merge pull request #113 from dbalsom/improved_decode
d854d22 
Merge table-based decode
@dbalsom
Various fixes and improvements for CPU validator
c83ed75
@dbalsom
Merge pull request #115 from dbalsom/v20_tests
fdf1231 
Merge improvements to CPU test generation
@dbalsom
Add CpuDispatch and Cpu trait
5539441
@dbalsom
Finish untangling CPUs; add initial V20
1935a57
@dbalsom
add REPC prefixes to V20 fuzzer
4e79078
@dbalsom
split validator mem_ops and fetch_ops to tolerate fetch differences
14c8174
@dbalsom
more v20 test work
9fa5b49
@dbalsom
more v20 test work (cont...)
8274793
@dbalsom
add test CPU type command line argument
c4141f6
@dbalsom
more V20 test work. support for prefetching
9a12efb
@dbalsom
fix csv header emit for sigrok mode
93c5ea7
@dbalsom
add cpu overlay for v20 upgrade support
17d23b9
@dbalsom
v20 functionally complete and passing tests
83695df
@dbalsom
Merge pull request #119 from dbalsom/multi_cpu
604b145 
Merge new V20 into 0.2.1 branch
@dbalsom
fix 8088 test generation for v2 of 8088 suite
28e9816
@dbalsom
cycle timing fixes for 8088 from V2 tests
8d48c74
@dbalsom
update 0.2.1 release artifacts
8a03711
@dbalsom
update 0.2.1 release artifacts
fc25758
@dbalsom
bump version to 0.2.2; add LoTech EMS board
5948f12
@dbalsom
add Mode register bits to CGA debug state
4f5a7f2
@dbalsom
don't wrap vcc at 127, fixes bbsimcga
fa686bc
dbalsom and others added 28 commits February 24, 2025 21:37
@dbalsom
Merge pull request #159 from dbalsom/version_0_4_0_dev
b66530b 
i despair of this ever working
@dbalsom
bump
ba81d07
@dbalsom
Merge pull request #160 from dbalsom/version_0_4_0_dev
463977c 
bump
@dbalsom
last try
57aab37
@dbalsom
Merge pull request #161 from dbalsom/version_0_4_0_dev
7cb28e8 
last try
@dbalsom
fix wasm build after shader refactoring; implement basic xtide device
7f6da58
@dbalsom
add rfd; wrap Builder errors in MessageBoxes for clarity when MartyPC…
a6f6d99 
… doesn't start
@lautis0503
Merge pull request #1 from lautis0503/version_0_4_0_GHA
3826e70 
Fix Github Actions on Windows
@lautis0503
Change GHA branch back to default
b04e476
@dbalsom
implement memory and CPU register editing
bae5829
@dbalsom
Merge pull request #162 from lautis0503/version_0_4_0
b5abb45 
Fix Github Actions using Rust nightly on Windows/MSYS2
@dbalsom
rename rust-toolchain to rust-toolchain.toml
9b2f4c8
@dbalsom
rename rust-toolchain to rust-toolchain.toml
26b3aec
@dbalsom
attempt to fix linux gha
13bdd28
@dbalsom
attempt to fix linux gha - take #2
7ead635
@dbalsom
attempt to fix linux gha - take #3
b5af562
@dbalsom
attempt to fix linux gha - take #4
1d44392
@dbalsom
remove 'unstable' section from ./cargo/config.toml. it is not target …
4fba01a 
…specific. add to env instead for each build script
@dbalsom
remove 'unstable' section from ./cargo/config.toml. it is not target …
d9322cf 
…specific. add to env instead for each build script
@dbalsom
don't build devtools feature
c9e654f
@dbalsom
macos gha: switch to nightly?
596bd0a
@dbalsom
Merge branch 'version_0_4_0' into version_0_4_0_dev
12bfedc 
# Conflicts:
#	.github/workflows/windows.yml
@dbalsom
macos: explicitly install nightly
70469d3
@dbalsom
cargo update opl3-rs to bump package for macos fix
4b64c9b
@dbalsom
cargo update opl3-rs to bump package for macos fix (take #2)
04c228c
@dbalsom
gha: track merge to master branch
a9663d7
@dbalsom
Merge pull request #164 from dbalsom/version_0_4_0_dev
0b816cf 
Fix github actions.
@dbalsom
gha: master -> main
9b42fec
@dbalsom dbalsom merged commit e597918 into main Mar 1, 2025
4 checks passed
@dbalsom dbalsom deleted the version_0_4_0 branch March 2, 2025 15:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@dbalsom @folkertvanheusden @plisskin @lautis0503