Skip to content

Add no-argument form of RFI #12

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

Open
interfect wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add no-argument form of RFI #12

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 10 additions & 3 deletions DAsm.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -662,10 +662,17 @@ namespace DAsm{
lOp = GetSpecialOpcode(first_str);
lWord |= lOp << 5;
if(final_split_list.size()<1){
Error(first_str.append(std::string(" opcode requires an operand")));
return;
// These opcodes all take 1 argument
if(lOp != 0x0B){
// Opcodes that aren't RFI actually need their arguments
Error(first_str.append(std::string(" opcode requires an operand")));
return;
}
// RFI (0x0B), which doesn't use its argument at all, can take
// no arguments. So if we have no argument for RFI, do nothing.
}else{
lWord |= ParseArg(*final_split_list.begin(), true) << 10;
}
lWord |= ParseArg(*final_split_list.begin(), true) << 10;
}else{
if(final_split_list.size()<2){
Error(first_str.append(std::string(" requires two operands")));
Expand Down