search

kanjitalk755 / macemu

Basilisk II and SheepShaver Macintosh emulators
349 stars 53 forks source link

modify for workaround <cannot map RAM:No Error> caused by confliction… #192

Closed chenchijung closed 7 months ago

chenchijung commented 7 months ago

… with MSI afterburner or RIVA Tuner statistic tuner Server. This workaround move init_vm() and allocation for Mac ROM, Mac RAM close to start of main().

chenchijung commented 7 months ago

Workaround for [cannot map RAM:No Error]

kanjitalk755 commented 7 months ago

I found a problem. ROMBase is comparing value ​​before setting it.

https://github.com/chenchijung/macemu/blob/45e3bd1d3e72a4996cba8a858467bed3fb4af4ce/SheepShaver/src/Windows/main_windows.cpp#L233-L244

chenchijung commented 7 months ago

Yes. This is my mistake.

chenchijung commented 7 months ago

Sorry. Need to move line 233-236 if (RAMBase > ROMBase) { ErrorAlert(GetString(STR_RAM_HIGHER_THAN_ROM_ERR)); goto quit; } after line 247 D(bug("ROM area at %p (%08x)\n", ROMBaseHost, ROMBase)); to remove this "compare before setting" issue.

Can you do it for me? I am new to git and still struggle on it. (In fact, RAMBase and ROMBase is constant in program. So, this compare is always false.)

kanjitalk755 commented 7 months ago

I can't check it in my environment, so please check it in your environment after making the changes. Once it works, make an additional commit to the master branch where you issued the pull request.

chenchijung commented 7 months ago

fix ROMBase compare before assignment issue

Korkman commented 7 months ago

Confirming this as fixed, thank you!