master #1

Open

sid wants to merge 10 commits from master into upstream

pull from: master

merge into: sid:upstream

sid:upstream

Conversation 0 Commits 10 Files changed 31 +62310 -100

sid commented 2026-08-24 11:39:48 +02:00

Owner

Copy link

No description provided.

sid added 7 commits 2026-08-24 11:39:49 +02:00

add nix flake for Renode development and packaging 41874b2f7c

add m68hc12 core CPU support 8c20d3337e

add m68hc12 GDB server and disassembler support 68d1dd46ab

add m68hc12 S-record and ELF loading tests 22703cfa0b

add m68hc12 extended and complex instructions 9c0da9c14f

add m68hc12 big-endian data access e3acce94ae

add m68hc12 big-endian word placement regression 3498308780

sid added 1 commit 2026-08-24 11:41:23 +02:00

remove .github 066d674487

sid added 1 commit 2026-08-24 11:47:47 +02:00

add docs: hc11/hcs12/hcs12x instructions sets b27a5bbb3d

sid added 1 commit 2026-09-18 10:14:57 +02:00

add AGENTS.md 60e59b6288

This pull request has changes conflicting with the target branch.

• src/Infrastructure

View command line instructions

Manual merge helper

Use this merge commit message when completing the merge manually.

Merge commit title Merge pull request 'master' (#1) from master into upstream

Merge commit body Reviewed-on: https://git.sid.ovh/sid/renode-m68hc12/pulls/1

Merge pull request 'master' (#1) from master into upstream Reviewed-on: https://git.sid.ovh/sid/renode-m68hc12/pulls/1 Copy merge commit message

Checkout

From your project repository, check out a new branch and test the changes.

git fetch -u origin master:master

git switch master

Merge

Merge the changes and update on Forgejo.

Warning: The "Autodetect manual merge" setting is not enabled for this repository, you will have to mark this pull request as manually merged afterwards.

git switch upstream

git merge --no-ff master

git switch master

git rebase upstream

git switch upstream

git merge --ff-only master

git switch master

git rebase upstream

git switch upstream

git merge --no-ff master

git switch upstream

git merge --squash master

git switch upstream

git merge --ff-only master

git switch upstream

git merge master

git push origin upstream

Sign in to join this conversation.

Reviewers

No reviewers

Labels

Clear labels

No items

No labels

Milestone

Clear milestone

No items

No milestone

Projects

Clear projects

No items

No project

Assignees

Clear assignees

No assignees

1 participant

Notifications

Subscribe

Due date

The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference

sid/renode-m68hc12!1

No description provided.