Skip to content

fix decodeInstruction #62

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
zhiqiangxu wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

fix decodeInstruction #62

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
12 changes: 6 additions & 6 deletions asmparser/mips/mips_parser.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,22 +114,22 @@ func parseInstruction(line string) (*instruction, error) {
if len(matches) <= 4 {
return nil, fmt.Errorf("failed to parse instruction: %s", line)
}
instr, err := decodeInstruction(strings.ReplaceAll(matches[3], " ", ""))
if err != nil {
return nil, fmt.Errorf("invalid MIPS instruction format: %w", err)
}
pcAddress, err := strconv.ParseUint(matches[1], 16, 64)
if err != nil {
return nil, fmt.Errorf("invalid instruction address: %w", err)
}
instr, err := decodeInstruction(strings.ReplaceAll(matches[3], " ", ""), pcAddress)
if err != nil {
return nil, fmt.Errorf("invalid MIPS instruction format: %w", err)
}
instr.opcodeString = matches[4]
instr.address = pcAddress
return instr, nil
}

// decodeInstruction decodes a hexadecimal MIPS instruction.
// https://en.wikibooks.org/wiki/MIPS_Assembly/Instruction_Formats#FI_Instructions
func decodeInstruction(str string) (*instruction, error) {
func decodeInstruction(str string, pcAddress uint64) (*instruction, error) {
_instruction, err := strconv.ParseUint(str, 16, 32)
if err != nil {
return nil, fmt.Errorf("failed to parse hex instruction: %w", err)
Expand Down Expand Up @@ -163,7 +163,7 @@ func decodeInstruction(str string) (*instruction, error) {
int64(funcCode),
)
case 0x02, 0x03: // J-Type Instructions (Jump)
targetAddress := (instr & 0x03FFFFFF) << 2
targetAddress := (instr&0x03FFFFFF)<<2 + (uint32(pcAddress+4) & 0xF0000000)
decodedInstruction.instType = asmparser.JType
//nolint
decodedInstruction.operands = append(decodedInstruction.operands, int64(targetAddress))
Expand Down