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.

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

[jak 2] fix boot, increase level heap sizes #2252

Merged
merged 1 commit into from
Feb 25, 2023
Merged

Conversation

water111
Copy link
Collaborator

Increase level heaps and borrow heaps. The level heap increase was likely not needed, but better safe than sorry. We allocate the 128 MB main heap anyway so there's no harm.

Also fix the crash when using -boot. As I thought it was just a one-line typo in the kernel.

@Zedb0T
Copy link
Contributor

Zedb0T commented Feb 25, 2023

Note sure why, but when I merge this into my branch it won't boot. I can just skip it its not an issue. Just documenting it incase others experience the issue too.

Steps were task extract -> gc2 -> gcnoboot

671a565 Merge Does not work

fee8641 Revert Works again

Again not looking for diagnostics here just purely documenting in case it helps find an issue down the road.

@xTVaser
Copy link
Member

xTVaser commented Feb 25, 2023

What is gc2 and gcnoboot exactly?

@Zedb0T
Copy link
Contributor

Zedb0T commented Feb 25, 2023

The batch scripts on a windows 11 environment, also I just noticed I forgot to mention that I rebuilt the cpp in visual studio.
(The rebuild was the first thing I did before the extract if that matters)

gc2 also runs the following startup.gc file

(lt)
(dbgc)
(test-play)
(set! (-> *pc-settings* skip-broken-mission?) #t)```

@water111
Copy link
Collaborator Author

Looking at the merge, it kinda seems like that was merging a different PR?
671a565

But let's try to figure this out. If you run those commands manually, which one crashes? What is printed when it happens?

@water111 water111 merged commit 3f1f443 into master Feb 25, 2023
@water111 water111 deleted the w/bigger-heaps-fix-boot branch April 1, 2023 00:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants