Skip to content

Commit 962442a

Browse files
authored
Implement remaining MEMACC commands (#2281)
* Implement remaining MEMACC commands * Remove unnecessary memacc cases
1 parent 041ff61 commit 962442a

1 file changed

Lines changed: 24 additions & 25 deletions

File tree

tools/mid2agb/agb.cpp

Lines changed: 24 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -273,54 +273,53 @@ void PrintMemAcc(const Event& event)
273273
case 0x05:
274274
PrintByte("MEMACC, mem_mem_sub, 0x%02X, 0x%02X", s_memaccParam1, event.param2);
275275
break;
276-
// TODO: everything else
277276
case 0x06:
277+
PrintByte("MEMACC, mem_beq, 0x%02X, %u", s_memaccParam1, event.param2);
278+
PrintWord("%s_%u_L%u", g_asmLabel.c_str(), g_agbTrack, s_memaccParam2);
278279
break;
279280
case 0x07:
281+
PrintByte("MEMACC, mem_bne, 0x%02X, %u", s_memaccParam1, event.param2);
282+
PrintWord("%s_%u_L%u", g_asmLabel.c_str(), g_agbTrack, s_memaccParam2);
280283
break;
281284
case 0x08:
285+
PrintByte("MEMACC, mem_bhi, 0x%02X, %u", s_memaccParam1, event.param2);
286+
PrintWord("%s_%u_L%u", g_asmLabel.c_str(), g_agbTrack, s_memaccParam2);
282287
break;
283288
case 0x09:
289+
PrintByte("MEMACC, mem_bhs, 0x%02X, %u", s_memaccParam1, event.param2);
290+
PrintWord("%s_%u_L%u", g_asmLabel.c_str(), g_agbTrack, s_memaccParam2);
284291
break;
285292
case 0x0A:
293+
PrintByte("MEMACC, mem_bls, 0x%02X, %u", s_memaccParam1, event.param2);
294+
PrintWord("%s_%u_L%u", g_asmLabel.c_str(), g_agbTrack, s_memaccParam2);
286295
break;
287296
case 0x0B:
297+
PrintByte("MEMACC, mem_blo, 0x%02X, %u", s_memaccParam1, event.param2);
298+
PrintWord("%s_%u_L%u", g_asmLabel.c_str(), g_agbTrack, s_memaccParam2);
288299
break;
289300
case 0x0C:
301+
PrintByte("MEMACC, mem_mem_beq, 0x%02X, 0x%02X", s_memaccParam1, event.param2);
302+
PrintWord("%s_%u_L%u", g_asmLabel.c_str(), g_agbTrack, s_memaccParam2);
290303
break;
291304
case 0x0D:
305+
PrintByte("MEMACC, mem_mem_bne, 0x%02X, 0x%02X", s_memaccParam1, event.param2);
306+
PrintWord("%s_%u_L%u", g_asmLabel.c_str(), g_agbTrack, s_memaccParam2);
292307
break;
293308
case 0x0E:
309+
PrintByte("MEMACC, mem_mem_bhi, 0x%02X, 0x%02X", s_memaccParam1, event.param2);
310+
PrintWord("%s_%u_L%u", g_asmLabel.c_str(), g_agbTrack, s_memaccParam2);
294311
break;
295312
case 0x0F:
313+
PrintByte("MEMACC, mem_mem_bhs, 0x%02X, 0x%02X", s_memaccParam1, event.param2);
314+
PrintWord("%s_%u_L%u", g_asmLabel.c_str(), g_agbTrack, s_memaccParam2);
296315
break;
297316
case 0x10:
317+
PrintByte("MEMACC, mem_mem_bls, 0x%02X, 0x%02X", s_memaccParam1, event.param2);
318+
PrintWord("%s_%u_L%u", g_asmLabel.c_str(), g_agbTrack, s_memaccParam2);
298319
break;
299320
case 0x11:
300-
break;
301-
case 0x46:
302-
break;
303-
case 0x47:
304-
break;
305-
case 0x48:
306-
break;
307-
case 0x49:
308-
break;
309-
case 0x4A:
310-
break;
311-
case 0x4B:
312-
break;
313-
case 0x4C:
314-
break;
315-
case 0x4D:
316-
break;
317-
case 0x4E:
318-
break;
319-
case 0x4F:
320-
break;
321-
case 0x50:
322-
break;
323-
case 0x51:
321+
PrintByte("MEMACC, mem_mem_blo, 0x%02X, 0x%02X", s_memaccParam1, event.param2);
322+
PrintWord("%s_%u_L%u", g_asmLabel.c_str(), g_agbTrack, s_memaccParam2);
324323
break;
325324
default:
326325
break;

0 commit comments

Comments
 (0)