fix m740, survives disasm/asm roundtrip now, still needs some work though
This commit is contained in:
mrdudz
@@ -92,6 +92,29 @@ static void OneLine (const OpcDesc* D, const char* Arg, ...)
|
||||
LineFeed ();
|
||||
}
|
||||
|
||||
static void OneLineNoIndent (const OpcDesc* D, const char* Arg, ...) attribute ((format(printf, 2, 3)));
|
||||
static void OneLineNoIndent (const OpcDesc* D, const char* Arg, ...)
|
||||
/* Output one line with the given mnemonic and argument */
|
||||
{
|
||||
char Buf [256];
|
||||
va_list ap;
|
||||
|
||||
/* Mnemonic */
|
||||
Mnemonic (D->Mnemo);
|
||||
|
||||
/* Argument */
|
||||
va_start (ap, Arg);
|
||||
xvsprintf (Buf, sizeof (Buf), Arg, ap);
|
||||
va_end (ap);
|
||||
|
||||
Output ("%s", Buf);
|
||||
|
||||
/* Add the code stuff as comment */
|
||||
LineComment (PC, D->Size);
|
||||
|
||||
/* End the line */
|
||||
LineFeed ();
|
||||
}
|
||||
|
||||
|
||||
static const char* GetAbsOverride (unsigned Flags, unsigned Addr)
|
||||
@@ -531,7 +554,7 @@ void OH_BitBranch (const OpcDesc* D)
|
||||
xfree (BranchLabel);
|
||||
}
|
||||
|
||||
void OH_BitBranchm740 (const OpcDesc* D)
|
||||
void OH_BitBranch_m740 (const OpcDesc* D)
|
||||
{
|
||||
unsigned Bit = GetCodeByte (PC) >> 5;
|
||||
unsigned Addr = GetCodeByte (PC+1);
|
||||
@@ -545,7 +568,7 @@ void OH_BitBranchm740 (const OpcDesc* D)
|
||||
GenerateLabel (flLabel, BranchAddr);
|
||||
|
||||
/* Output the line */
|
||||
OneLine (D, "%01X,%s,%s", Bit, GetAddrArg (D->Flags, Addr), GetAddrArg (flLabel, BranchAddr));
|
||||
OneLineNoIndent (D, "%01X %s,%s", Bit, GetAddrArg (D->Flags, Addr), GetAddrArg (flLabel, BranchAddr));
|
||||
}
|
||||
|
||||
void OH_ImmediateDirect (const OpcDesc* D)
|
||||
@@ -743,7 +766,7 @@ void OH_ZeroPageBit (const OpcDesc* D)
|
||||
GenerateLabel (D->Flags, Addr);
|
||||
|
||||
/* Output the line */
|
||||
OneLine (D, "%01X,%s", Bit, GetAddrArg (D->Flags, Addr));
|
||||
OneLineNoIndent (D, "%01X %s", Bit, GetAddrArg (D->Flags, Addr));
|
||||
}
|
||||
|
||||
|
||||
@@ -753,7 +776,7 @@ void OH_AccumulatorBit (const OpcDesc* D)
|
||||
unsigned Bit = GetCodeByte (PC) >> 5;
|
||||
|
||||
/* Output the line */
|
||||
OneLine (D, "%01X,a", Bit);
|
||||
OneLineNoIndent (D, "%01X a", Bit);
|
||||
}
|
||||
|
||||
|
||||
@@ -770,7 +793,7 @@ void OH_AccumulatorBitBranch (const OpcDesc* D)
|
||||
GenerateLabel (flLabel, BranchAddr);
|
||||
|
||||
/* Output the line */
|
||||
OneLine (D, "%01X,a,%s", Bit, GetAddrArg (flLabel, BranchAddr));
|
||||
OneLineNoIndent (D, "%01X a, %s", Bit, GetAddrArg (flLabel, BranchAddr));
|
||||
}
|
||||
|
||||
|
||||
|
||||
@@ -78,7 +78,7 @@ void OH_DirectXIndirect (const OpcDesc*);
|
||||
void OH_AbsoluteIndirect (const OpcDesc*);
|
||||
|
||||
void OH_BitBranch (const OpcDesc*);
|
||||
void OH_BitBranchm740 (const OpcDesc*);
|
||||
void OH_BitBranch_m740 (const OpcDesc*);
|
||||
|
||||
void OH_ImmediateDirect (const OpcDesc*);
|
||||
void OH_ImmediateDirectX (const OpcDesc*);
|
||||
|
||||
@@ -55,7 +55,7 @@ const OpcDesc OpcTable_M740[256] = {
|
||||
{ "", 1, flIllegal, OH_Illegal }, /* $04 */
|
||||
{ "ora", 2, flUseLabel, OH_Direct }, /* $05 */
|
||||
{ "asl", 2, flUseLabel, OH_Direct }, /* $06 */
|
||||
{ "bbs", 3, flUseLabel, OH_BitBranchm740 }, /* $07 */
|
||||
{ "bbs", 3, flUseLabel, OH_BitBranch_m740 }, /* $07 */
|
||||
{ "php", 1, flNone, OH_Implicit }, /* $08 */
|
||||
{ "ora", 2, flNone, OH_Immediate }, /* $09 */
|
||||
{ "asl", 1, flNone, OH_Accumulator }, /* $0a */
|
||||
@@ -71,7 +71,7 @@ const OpcDesc OpcTable_M740[256] = {
|
||||
{ "", 1, flIllegal, OH_Illegal }, /* $14 */
|
||||
{ "ora", 2, flUseLabel, OH_DirectX }, /* $15 */
|
||||
{ "asl", 2, flUseLabel, OH_DirectX }, /* $16 */
|
||||
{ "bbc", 3, flUseLabel, OH_BitBranchm740 }, /* $17 */
|
||||
{ "bbc", 3, flUseLabel, OH_BitBranch_m740 }, /* $17 */
|
||||
{ "clc", 1, flNone, OH_Implicit }, /* $18 */
|
||||
{ "ora", 3, flUseLabel, OH_AbsoluteY }, /* $19 */
|
||||
{ "dec", 1, flNone, OH_Accumulator }, /* $1a */
|
||||
@@ -87,7 +87,7 @@ const OpcDesc OpcTable_M740[256] = {
|
||||
{ "bit", 2, flUseLabel, OH_Direct }, /* $24 */
|
||||
{ "and", 2, flUseLabel, OH_Direct }, /* $25 */
|
||||
{ "rol", 2, flUseLabel, OH_Direct }, /* $26 */
|
||||
{ "bbs", 3, flUseLabel, OH_BitBranchm740 }, /* $27 */
|
||||
{ "bbs", 3, flUseLabel, OH_BitBranch_m740 }, /* $27 */
|
||||
{ "plp", 1, flNone, OH_Implicit }, /* $28 */
|
||||
{ "and", 2, flNone, OH_Immediate }, /* $29 */
|
||||
{ "rol", 1, flNone, OH_Accumulator }, /* $2a */
|
||||
@@ -103,7 +103,7 @@ const OpcDesc OpcTable_M740[256] = {
|
||||
{ "", 1, flIllegal, OH_Illegal }, /* $34 */
|
||||
{ "and", 2, flUseLabel, OH_DirectX }, /* $35 */
|
||||
{ "rol", 2, flUseLabel, OH_DirectX }, /* $36 */
|
||||
{ "bbc", 3, flUseLabel, OH_BitBranchm740 }, /* $37 */
|
||||
{ "bbc", 3, flUseLabel, OH_BitBranch_m740 }, /* $37 */
|
||||
{ "sec", 1, flNone, OH_Implicit }, /* $38 */
|
||||
{ "and", 3, flUseLabel, OH_AbsoluteY }, /* $39 */
|
||||
{ "inc", 1, flNone, OH_Accumulator }, /* $3a */
|
||||
@@ -119,7 +119,7 @@ const OpcDesc OpcTable_M740[256] = {
|
||||
{ "com", 2, flUseLabel, OH_Direct }, /* $44 */
|
||||
{ "eor", 2, flUseLabel, OH_Direct }, /* $45 */
|
||||
{ "lsr", 2, flUseLabel, OH_Direct }, /* $46 */
|
||||
{ "bbs", 3, flUseLabel, OH_BitBranchm740 }, /* $47 */
|
||||
{ "bbs", 3, flUseLabel, OH_BitBranch_m740 }, /* $47 */
|
||||
{ "pha", 1, flNone, OH_Implicit }, /* $48 */
|
||||
{ "eor", 2, flNone, OH_Immediate }, /* $49 */
|
||||
{ "lsr", 1, flNone, OH_Accumulator }, /* $4a */
|
||||
@@ -135,7 +135,7 @@ const OpcDesc OpcTable_M740[256] = {
|
||||
{ "", 1, flIllegal, OH_Illegal }, /* $54 */
|
||||
{ "eor", 2, flUseLabel, OH_DirectX }, /* $55 */
|
||||
{ "lsr", 2, flUseLabel, OH_DirectX }, /* $56 */
|
||||
{ "bbc", 3, flUseLabel, OH_BitBranchm740 }, /* $57 */
|
||||
{ "bbc", 3, flUseLabel, OH_BitBranch_m740 }, /* $57 */
|
||||
{ "cli", 1, flNone, OH_Implicit }, /* $58 */
|
||||
{ "eor", 3, flUseLabel, OH_AbsoluteY }, /* $59 */
|
||||
{ "", 1, flIllegal, OH_Illegal }, /* $5a */
|
||||
@@ -146,12 +146,12 @@ const OpcDesc OpcTable_M740[256] = {
|
||||
{ "clb", 2, flUseLabel, OH_ZeroPageBit }, /* $5f */
|
||||
{ "rts", 1, flNone, OH_Rts }, /* $60 */
|
||||
{ "adc", 2, flUseLabel, OH_DirectXIndirect }, /* $61 */
|
||||
{ "mul", 2, flUseLabel, OH_DirectX }, /* $62 */
|
||||
{ "", 1, flIllegal, OH_Illegal }, /* $62 */
|
||||
{ "bbs", 2, flUseLabel, OH_AccumulatorBitBranch }, /* $63 */
|
||||
{ "tst", 2, flUseLabel, OH_Direct }, /* $64 */
|
||||
{ "adc", 2, flUseLabel, OH_Direct }, /* $65 */
|
||||
{ "ror", 2, flUseLabel, OH_Direct }, /* $66 */
|
||||
{ "bbs", 3, flUseLabel, OH_BitBranchm740 }, /* $67 */
|
||||
{ "bbs", 3, flUseLabel, OH_BitBranch_m740 }, /* $67 */
|
||||
{ "pla", 1, flNone, OH_Implicit }, /* $68 */
|
||||
{ "adc", 2, flNone, OH_Immediate }, /* $69 */
|
||||
{ "ror", 1, flNone, OH_Accumulator }, /* $6a */
|
||||
@@ -167,7 +167,7 @@ const OpcDesc OpcTable_M740[256] = {
|
||||
{ "", 1, flIllegal, OH_Illegal }, /* $74 */
|
||||
{ "adc", 2, flUseLabel, OH_DirectX }, /* $75 */
|
||||
{ "ror", 2, flUseLabel, OH_DirectX }, /* $76 */
|
||||
{ "bbc", 3, flUseLabel, OH_BitBranchm740 }, /* $77 */
|
||||
{ "bbc", 3, flUseLabel, OH_BitBranch_m740 }, /* $77 */
|
||||
{ "sei", 1, flNone, OH_Implicit }, /* $78 */
|
||||
{ "adc", 3, flUseLabel, OH_AbsoluteY }, /* $79 */
|
||||
{ "", 1, flIllegal, OH_Illegal }, /* $7a */
|
||||
@@ -183,7 +183,7 @@ const OpcDesc OpcTable_M740[256] = {
|
||||
{ "sty", 2, flUseLabel, OH_Direct }, /* $84 */
|
||||
{ "sta", 2, flUseLabel, OH_Direct }, /* $85 */
|
||||
{ "stx", 2, flUseLabel, OH_Direct }, /* $86 */
|
||||
{ "bbs", 3, flUseLabel, OH_BitBranchm740 }, /* $87 */
|
||||
{ "bbs", 3, flUseLabel, OH_BitBranch_m740 }, /* $87 */
|
||||
{ "dey", 1, flNone, OH_Implicit }, /* $88 */
|
||||
{ "", 1, flIllegal, OH_Illegal }, /* $89 */
|
||||
{ "txa", 1, flNone, OH_Implicit }, /* $8a */
|
||||
@@ -199,7 +199,7 @@ const OpcDesc OpcTable_M740[256] = {
|
||||
{ "sty", 2, flUseLabel, OH_DirectX }, /* $94 */
|
||||
{ "sta", 2, flUseLabel, OH_DirectX }, /* $95 */
|
||||
{ "stx", 2, flUseLabel, OH_DirectY }, /* $96 */
|
||||
{ "bbc", 3, flUseLabel, OH_BitBranchm740 }, /* $97 */
|
||||
{ "bbc", 3, flUseLabel, OH_BitBranch_m740 }, /* $97 */
|
||||
{ "tya", 1, flNone, OH_Implicit }, /* $98 */
|
||||
{ "sta", 3, flUseLabel, OH_AbsoluteY }, /* $99 */
|
||||
{ "txs", 1, flNone, OH_Implicit }, /* $9a */
|
||||
@@ -215,7 +215,7 @@ const OpcDesc OpcTable_M740[256] = {
|
||||
{ "ldy", 2, flUseLabel, OH_Direct }, /* $a4 */
|
||||
{ "lda", 2, flUseLabel, OH_Direct }, /* $a5 */
|
||||
{ "ldx", 2, flUseLabel, OH_Direct }, /* $a6 */
|
||||
{ "bbs", 3, flUseLabel, OH_BitBranchm740 }, /* $a7 */
|
||||
{ "bbs", 3, flUseLabel, OH_BitBranch_m740 }, /* $a7 */
|
||||
{ "tay", 1, flNone, OH_Implicit }, /* $a8 */
|
||||
{ "lda", 2, flNone, OH_Immediate }, /* $a9 */
|
||||
{ "tax", 1, flNone, OH_Implicit }, /* $aa */
|
||||
@@ -231,7 +231,7 @@ const OpcDesc OpcTable_M740[256] = {
|
||||
{ "ldy", 2, flUseLabel, OH_DirectX }, /* $b4 */
|
||||
{ "lda", 2, flUseLabel, OH_DirectX }, /* $b5 */
|
||||
{ "ldx", 2, flUseLabel, OH_DirectY }, /* $b6 */
|
||||
{ "bbc", 3, flUseLabel, OH_BitBranchm740 }, /* $b7 */
|
||||
{ "bbc", 3, flUseLabel, OH_BitBranch_m740 }, /* $b7 */
|
||||
{ "clv", 1, flNone, OH_Implicit }, /* $b8 */
|
||||
{ "lda", 3, flUseLabel, OH_AbsoluteY }, /* $b9 */
|
||||
{ "tsx", 1, flNone, OH_Implicit }, /* $ba */
|
||||
@@ -242,12 +242,12 @@ const OpcDesc OpcTable_M740[256] = {
|
||||
{ "clb", 2, flUseLabel, OH_ZeroPageBit }, /* $bf */
|
||||
{ "cpy", 2, flNone, OH_Immediate }, /* $c0 */
|
||||
{ "cmp", 2, flUseLabel, OH_DirectXIndirect }, /* $c1 */
|
||||
{ "wit", 1, flNone, OH_Implicit, }, /* $c2 */
|
||||
{ "slw", 1, flNone, OH_Implicit, }, /* $c2 */
|
||||
{ "bbs", 2, flUseLabel, OH_AccumulatorBitBranch }, /* $c3 */
|
||||
{ "cpy", 2, flUseLabel, OH_Direct }, /* $c4 */
|
||||
{ "cmp", 2, flUseLabel, OH_Direct }, /* $c5 */
|
||||
{ "dec", 2, flUseLabel, OH_Direct }, /* $c6 */
|
||||
{ "bbs", 3, flUseLabel, OH_BitBranchm740 }, /* $c7 */
|
||||
{ "bbs", 3, flUseLabel, OH_BitBranch_m740 }, /* $c7 */
|
||||
{ "iny", 1, flNone, OH_Implicit }, /* $c8 */
|
||||
{ "cmp", 2, flNone, OH_Immediate }, /* $c9 */
|
||||
{ "dex", 1, flNone, OH_Implicit }, /* $ca */
|
||||
@@ -263,7 +263,7 @@ const OpcDesc OpcTable_M740[256] = {
|
||||
{ "", 1, flIllegal, OH_Illegal }, /* $d4 */
|
||||
{ "cmp", 2, flUseLabel, OH_DirectX }, /* $d5 */
|
||||
{ "dec", 2, flUseLabel, OH_DirectX }, /* $d6 */
|
||||
{ "bbc", 3, flUseLabel, OH_BitBranchm740 }, /* $d7 */
|
||||
{ "bbc", 3, flUseLabel, OH_BitBranch_m740 }, /* $d7 */
|
||||
{ "cld", 1, flNone, OH_Implicit }, /* $d8 */
|
||||
{ "cmp", 3, flUseLabel, OH_AbsoluteY }, /* $d9 */
|
||||
{ "", 1, flIllegal, OH_Illegal }, /* $da */
|
||||
@@ -274,12 +274,12 @@ const OpcDesc OpcTable_M740[256] = {
|
||||
{ "clb", 2, flUseLabel, OH_ZeroPageBit }, /* $df */
|
||||
{ "cpx", 2, flNone, OH_Immediate }, /* $e0 */
|
||||
{ "sbc", 2, flUseLabel, OH_DirectXIndirect }, /* $e1 */
|
||||
{ "div", 2, flUseLabel, OH_DirectX }, /* $e2 */
|
||||
{ "fst", 1, flNone, OH_Implicit }, /* $e2 */
|
||||
{ "bbs", 2, flUseLabel, OH_AccumulatorBitBranch }, /* $e3 */
|
||||
{ "cpx", 2, flUseLabel, OH_Direct }, /* $e4 */
|
||||
{ "sbc", 2, flUseLabel, OH_Direct }, /* $e5 */
|
||||
{ "inc", 2, flUseLabel, OH_Direct }, /* $e6 */
|
||||
{ "bbs", 3, flUseLabel, OH_BitBranchm740 }, /* $e7 */
|
||||
{ "bbs", 3, flUseLabel, OH_BitBranch_m740 }, /* $e7 */
|
||||
{ "inx", 1, flNone, OH_Implicit }, /* $e8 */
|
||||
{ "sbc", 2, flNone, OH_Immediate }, /* $e9 */
|
||||
{ "nop", 1, flNone, OH_Implicit }, /* $ea */
|
||||
@@ -295,7 +295,7 @@ const OpcDesc OpcTable_M740[256] = {
|
||||
{ "", 1, flIllegal, OH_Illegal }, /* $f4 */
|
||||
{ "sbc", 2, flUseLabel, OH_DirectX }, /* $f5 */
|
||||
{ "inc", 2, flUseLabel, OH_DirectX }, /* $f6 */
|
||||
{ "bbc", 3, flUseLabel, OH_BitBranchm740 }, /* $f7 */
|
||||
{ "bbc", 3, flUseLabel, OH_BitBranch_m740 }, /* $f7 */
|
||||
{ "sed", 1, flNone, OH_Implicit }, /* $f8 */
|
||||
{ "sbc", 3, flUseLabel, OH_AbsoluteY }, /* $f9 */
|
||||
{ "", 1, flIllegal, OH_Illegal }, /* $fa */
|
||||
|
||||
Reference in New Issue
Block a user