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

Debugger: Support multi-line assembling #4926

Merged
merged 1 commit into from
Oct 26, 2021

Conversation

F0bes
Copy link
Member

@F0bes F0bes commented Oct 21, 2021

Description of Changes

When multiple lines of opcodes are selected, the 'Assemble Opcode(s)' context menu and M-key shortcut will turn reassemble all of those opcodes.

Rationale behind Changes

Makes use of the multi line selection feature the debugger has.
Was also mentioned in a feature request #4889

Suggested Testing Steps

Try the assemble opcode feature in the debugger, see if it does it's job correctly.
Edit 1/2/3/etc opcodes and see if the result is okay.

@F0bes F0bes force-pushed the debugger-multiline-assemble branch 2 times, most recently from a875a3a to 3a53489 Compare October 21, 2021 22:11
@@ -1,4 +1,4 @@
/* PCSX2 - PS2 Emulator for PCs
/* PCSX2 - PS2 Emulator for PCs
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't know what the difference is between these two lines, neither does my git client.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It has to be an invisible character maybe a missing carriage return byte or something?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

BF3C1C2C-35C4-471D-9F1C-FF6FFAC861B7
2C0372D5-1EB0-4EC7-BE77-6A61A492B18F
I see it

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Weird, I'll try and fix it.

Copy link
Contributor

@seta-san seta-san Oct 21, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You already did. The fucked up characters were in master

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh haha, okay.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That's a UTF-8 BOM

Some editors (I think VS) seem to use it to identify whether files are UTF-8 or not

@F0bes F0bes force-pushed the debugger-multiline-assemble branch from 3a53489 to 9b2e7b6 Compare October 21, 2021 23:08
@michaelx333
Copy link

Seems to work great!

@refractionpcsx2 refractionpcsx2 merged commit 3705054 into PCSX2:master Oct 26, 2021

if (address == curAddress)
gotoAddress(manager.getNthNextAddress(curAddress, 1));
if((selectRangeEnd - selectRangeStart) > 4)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Formatting.

gotoAddress(manager.getNthNextAddress(curAddress, 1));
if((selectRangeEnd - selectRangeStart) > 4)
{
for(u32 addr = selectRangeStart; addr < selectRangeEnd; addr += 0x4)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Here also.

}
else
{
if (curAddress == newAddress && hasFocus)
toggleBreakpoint(false);
}

setCurAddress(newAddress, extend);
if(setNewAddress)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Last one.

@Kingcom Kingcom mentioned this pull request Apr 19, 2022
@F0bes F0bes deleted the debugger-multiline-assemble branch January 13, 2023 18:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants