Fixed inline assembler problems with instructions where implicit means
actually accumulator addressing. These went through and caused the optimizer to behave strangely. git-svn-id: svn://svn.cc65.org/cc65/trunk@3164 b7a2c559-68d2-44c3-8de9-860c34a00d81
This commit is contained in:
@@ -289,8 +289,12 @@ static CodeEntry* ParseInsn (CodeSeg* S, LineInfo* LI, const char* L)
|
|||||||
switch (*L) {
|
switch (*L) {
|
||||||
|
|
||||||
case '\0':
|
case '\0':
|
||||||
/* Implicit */
|
/* Implicit or accu */
|
||||||
|
if (OPC->Info & OF_NOIMP) {
|
||||||
|
AM = AM65_ACC;
|
||||||
|
} else {
|
||||||
AM = AM65_IMP;
|
AM = AM65_IMP;
|
||||||
|
}
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case '#':
|
case '#':
|
||||||
|
|||||||
@@ -77,7 +77,7 @@ const OPCDesc OPCTable[OP65_COUNT] = {
|
|||||||
0, /* size */
|
0, /* size */
|
||||||
REG_NONE, /* use */
|
REG_NONE, /* use */
|
||||||
REG_NONE, /* chg */
|
REG_NONE, /* chg */
|
||||||
OF_SETF /* flags */
|
OF_SETF | OF_NOIMP /* flags */
|
||||||
},
|
},
|
||||||
{ OP65_BCC, /* opcode */
|
{ OP65_BCC, /* opcode */
|
||||||
"bcc", /* mnemonic */
|
"bcc", /* mnemonic */
|
||||||
@@ -217,7 +217,7 @@ const OPCDesc OPCTable[OP65_COUNT] = {
|
|||||||
0, /* size */
|
0, /* size */
|
||||||
REG_NONE, /* use */
|
REG_NONE, /* use */
|
||||||
REG_NONE, /* chg */
|
REG_NONE, /* chg */
|
||||||
OF_SETF /* flags */
|
OF_SETF | OF_NOIMP /* flags */
|
||||||
},
|
},
|
||||||
{ OP65_DEX, /* opcode */
|
{ OP65_DEX, /* opcode */
|
||||||
"dex", /* mnemonic */
|
"dex", /* mnemonic */
|
||||||
@@ -252,7 +252,7 @@ const OPCDesc OPCTable[OP65_COUNT] = {
|
|||||||
0, /* size */
|
0, /* size */
|
||||||
REG_NONE, /* use */
|
REG_NONE, /* use */
|
||||||
REG_NONE, /* chg */
|
REG_NONE, /* chg */
|
||||||
OF_SETF /* flags */
|
OF_SETF | OF_NOIMP /* flags */
|
||||||
},
|
},
|
||||||
{ OP65_INX, /* opcode */
|
{ OP65_INX, /* opcode */
|
||||||
"inx", /* mnemonic */
|
"inx", /* mnemonic */
|
||||||
@@ -364,7 +364,7 @@ const OPCDesc OPCTable[OP65_COUNT] = {
|
|||||||
0, /* size */
|
0, /* size */
|
||||||
REG_NONE, /* use */
|
REG_NONE, /* use */
|
||||||
REG_NONE, /* chg */
|
REG_NONE, /* chg */
|
||||||
OF_SETF /* flags */
|
OF_SETF | OF_NOIMP /* flags */
|
||||||
},
|
},
|
||||||
{ OP65_NOP, /* opcode */
|
{ OP65_NOP, /* opcode */
|
||||||
"nop", /* mnemonic */
|
"nop", /* mnemonic */
|
||||||
@@ -441,14 +441,14 @@ const OPCDesc OPCTable[OP65_COUNT] = {
|
|||||||
0, /* size */
|
0, /* size */
|
||||||
REG_NONE, /* use */
|
REG_NONE, /* use */
|
||||||
REG_NONE, /* chg */
|
REG_NONE, /* chg */
|
||||||
OF_SETF /* flags */
|
OF_SETF | OF_NOIMP /* flags */
|
||||||
},
|
},
|
||||||
{ OP65_ROR, /* opcode */
|
{ OP65_ROR, /* opcode */
|
||||||
"ror", /* mnemonic */
|
"ror", /* mnemonic */
|
||||||
0, /* size */
|
0, /* size */
|
||||||
REG_NONE, /* use */
|
REG_NONE, /* use */
|
||||||
REG_NONE, /* chg */
|
REG_NONE, /* chg */
|
||||||
OF_SETF /* flags */
|
OF_SETF | OF_NOIMP /* flags */
|
||||||
},
|
},
|
||||||
/* Mark RTI as "uses all registers but doesn't change them", so the
|
/* Mark RTI as "uses all registers but doesn't change them", so the
|
||||||
* optimizer won't remove preceeding loads.
|
* optimizer won't remove preceeding loads.
|
||||||
|
|||||||
@@ -174,6 +174,7 @@ typedef enum {
|
|||||||
#define OF_REG_INCDEC 0x0400U /* A register increment or decrement */
|
#define OF_REG_INCDEC 0x0400U /* A register increment or decrement */
|
||||||
#define OF_SETF 0x0800U /* Insn will set all load flags (not carry) */
|
#define OF_SETF 0x0800U /* Insn will set all load flags (not carry) */
|
||||||
#define OF_CMP 0x1000U /* A compare A/X/Y instruction */
|
#define OF_CMP 0x1000U /* A compare A/X/Y instruction */
|
||||||
|
#define OF_NOIMP 0x2000U /* Implicit addressing mode is actually A */
|
||||||
|
|
||||||
/* Combined infos */
|
/* Combined infos */
|
||||||
#define OF_BRA (OF_UBRA | OF_CBRA) /* Operation is a jump/branch */
|
#define OF_BRA (OF_UBRA | OF_CBRA) /* Operation is a jump/branch */
|
||||||
|
|||||||
Reference in New Issue
Block a user