6502/cc65
1
0
Fork 0
mirror of https://github.com/cc65/cc65.git synced 2024-07-07 04:29:01 +00:00
Code Issues Projects Releases Wiki Activity

Start adding stuff that optimizes the new shift functions.

Browse Source 
git-svn-id: svn://svn.cc65.org/cc65/trunk@5768 b7a2c559-68d2-44c3-8de9-860c34a00d81
This commit is contained in:
uz 2012-07-07 17:56:39 +00:00
parent 859236615e
commit a27bc7774e
2 changed files with 204 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/cc65/codeopt.c
View File

@ -1040,7 +1040,6 @@ static unsigned RunOptGroup1 (CodeSeg* S)
Changes += RunOptFunc (S, &DOptStore5, 1); Changes += RunOptFunc (S, &DOptStore5, 1);
Changes += RunOptFunc (S, &DOptShift1, 1); Changes += RunOptFunc (S, &DOptShift1, 1);
Changes += RunOptFunc (S, &DOptShift2, 1); Changes += RunOptFunc (S, &DOptShift2, 1);
Changes += RunOptFunc (S, &DOptShift4, 1);
Changes += RunOptFunc (S, &DOptShift5, 1); Changes += RunOptFunc (S, &DOptShift5, 1);
Changes += RunOptFunc (S, &DOptShift6, 1); Changes += RunOptFunc (S, &DOptShift6, 1);
Changes += RunOptFunc (S, &DOptStore1, 1); Changes += RunOptFunc (S, &DOptStore1, 1);
@ -1087,6 +1086,7 @@ static unsigned RunOptGroup3 (CodeSeg* S)
C += RunOptFunc (S, &DOptNegAX1, 1); C += RunOptFunc (S, &DOptNegAX1, 1);
C += RunOptFunc (S, &DOptNegAX2, 1); C += RunOptFunc (S, &DOptNegAX2, 1);
C += RunOptFunc (S, &DOptStackOps, 3); C += RunOptFunc (S, &DOptStackOps, 3);
C += RunOptFunc (S, &DOptShift4, 1);
C += RunOptFunc (S, &DOptSub1, 1); C += RunOptFunc (S, &DOptSub1, 1);
C += RunOptFunc (S, &DOptSub2, 1); C += RunOptFunc (S, &DOptSub2, 1);
C += RunOptFunc (S, &DOptSub3, 1); C += RunOptFunc (S, &DOptSub3, 1);

271
src/cc65/coptshift.c
View File

@ -36,7 +36,7 @@
/* common */ /* common */
#include "chartype.h" #include "chartype.h"
/* cc65 */ /* cc65 */
#include "codeent.h" #include "codeent.h"
#include "codeinfo.h" #include "codeinfo.h"
#include "coptshift.h" #include "coptshift.h"
@ -49,19 +49,141 @@
/* Shift types */ /* Shift types. Shift type is in the first byte, shift count in the second */
enum { enum {
SHIFT_NONE, SHIFT_NONE = 0x0000,
SHIFT_ASR_1,
SHIFT_ASL_1, /* Masks */
SHIFT_LSR_1, SHIFT_MASK_COUNT = 0x00FF,
SHIFT_LSL_1 SHIFT_MASK_DIR = 0x0F00,
SHIFT_MASK_MODE = 0xF000, /* Arithmetic or logical */
SHIFT_MASK_TYPE = SHIFT_MASK_DIR | SHIFT_MASK_MODE,
/* Shift counts */
SHIFT_COUNT_Y = 0x0000, /* Count is in Y register */
SHIFT_COUNT_1 = 0x0001,
SHIFT_COUNT_2 = 0x0002,
SHIFT_COUNT_3 = 0x0003,
SHIFT_COUNT_4 = 0x0004,
SHIFT_COUNT_5 = 0x0005,
SHIFT_COUNT_6 = 0x0006,
SHIFT_COUNT_7 = 0x0007,
/* Shift directions */
SHIFT_DIR_LEFT = 0x0100,
SHIFT_DIR_RIGHT = 0x0200,
/* Shift modes */
SHIFT_MODE_ARITH = 0x1000,
SHIFT_MODE_LOGICAL = 0x2000,
/* Shift types */
SHIFT_TYPE_ASL = SHIFT_DIR_LEFT | SHIFT_MODE_ARITH,
SHIFT_TYPE_ASR = SHIFT_DIR_RIGHT | SHIFT_MODE_ARITH,
SHIFT_TYPE_LSL = SHIFT_DIR_LEFT | SHIFT_MODE_LOGICAL,
SHIFT_TYPE_LSR = SHIFT_DIR_RIGHT | SHIFT_MODE_LOGICAL,
/* Complete specs */
SHIFT_ASL_Y = SHIFT_TYPE_ASL | SHIFT_COUNT_Y,
SHIFT_ASR_Y = SHIFT_TYPE_ASR | SHIFT_COUNT_Y,
SHIFT_LSL_Y = SHIFT_TYPE_LSL | SHIFT_COUNT_Y,
SHIFT_LSR_Y = SHIFT_TYPE_LSR | SHIFT_COUNT_Y,
SHIFT_ASL_1 = SHIFT_TYPE_ASL | SHIFT_COUNT_1,
SHIFT_ASR_1 = SHIFT_TYPE_ASR | SHIFT_COUNT_1,
SHIFT_LSL_1 = SHIFT_TYPE_LSL | SHIFT_COUNT_1,
SHIFT_LSR_1 = SHIFT_TYPE_LSR | SHIFT_COUNT_1,
SHIFT_ASL_2 = SHIFT_TYPE_ASL | SHIFT_COUNT_2,
SHIFT_ASR_2 = SHIFT_TYPE_ASR | SHIFT_COUNT_2,
SHIFT_LSL_2 = SHIFT_TYPE_LSL | SHIFT_COUNT_2,
SHIFT_LSR_2 = SHIFT_TYPE_LSR | SHIFT_COUNT_2,
SHIFT_ASL_3 = SHIFT_TYPE_ASL | SHIFT_COUNT_3,
SHIFT_ASR_3 = SHIFT_TYPE_ASR | SHIFT_COUNT_3,
SHIFT_LSL_3 = SHIFT_TYPE_LSL | SHIFT_COUNT_3,
SHIFT_LSR_3 = SHIFT_TYPE_LSR | SHIFT_COUNT_3,
SHIFT_ASL_4 = SHIFT_TYPE_ASL | SHIFT_COUNT_4,
SHIFT_ASR_4 = SHIFT_TYPE_ASR | SHIFT_COUNT_4,
SHIFT_LSL_4 = SHIFT_TYPE_LSL | SHIFT_COUNT_4,
SHIFT_LSR_4 = SHIFT_TYPE_LSR | SHIFT_COUNT_4,
SHIFT_ASL_5 = SHIFT_TYPE_ASL | SHIFT_COUNT_5,
SHIFT_ASR_5 = SHIFT_TYPE_ASR | SHIFT_COUNT_5,
SHIFT_LSL_5 = SHIFT_TYPE_LSL | SHIFT_COUNT_5,
SHIFT_LSR_5 = SHIFT_TYPE_LSR | SHIFT_COUNT_5,
SHIFT_ASL_6 = SHIFT_TYPE_ASL | SHIFT_COUNT_6,
SHIFT_ASR_6 = SHIFT_TYPE_ASR | SHIFT_COUNT_6,
SHIFT_LSL_6 = SHIFT_TYPE_LSL | SHIFT_COUNT_6,
SHIFT_LSR_6 = SHIFT_TYPE_LSR | SHIFT_COUNT_6,
SHIFT_ASL_7 = SHIFT_TYPE_ASL | SHIFT_COUNT_7,
SHIFT_ASR_7 = SHIFT_TYPE_ASR | SHIFT_COUNT_7,
SHIFT_LSL_7 = SHIFT_TYPE_LSL | SHIFT_COUNT_7,
SHIFT_LSR_7 = SHIFT_TYPE_LSR | SHIFT_COUNT_7,
}; };
/* Macros to extract values from a shift type */
#define SHIFT_COUNT(S) ((S) & SHIFT_MASK_COUNT)
#define SHIFT_DIR(S) ((S) & SHIFT_MASK_DIR)
#define SHIFT_MODE(S) ((S) & SHIFT_MASK_MODE)
#define SHIFT_TYPE(S) ((S) & SHIFT_MASK_TYPE)
/*****************************************************************************/ /*****************************************************************************/
/* Optimize shifts */ /* Helper routines */
/*****************************************************************************/
static unsigned GetShift (const char* Name)
/* Determine the shift from the name of the subroutine */
{
unsigned Type;
if (strncmp (Name, "aslax", 5) == 0) {
Type = SHIFT_TYPE_ASL;
} else if (strncmp (Name, "asrax", 5) == 0) {
Type = SHIFT_TYPE_ASR;
} else if (strncmp (Name, "shlax", 5) == 0) {
Type = SHIFT_TYPE_LSL;
} else if (strncmp (Name, "shrax", 5) == 0) {
Type = SHIFT_TYPE_LSR;
} else {
/* Nothing we know */
return SHIFT_NONE;
}
/* Get the count */
switch (Name[5]) {
case 'y': Type |= SHIFT_COUNT_Y; break;
case '1': Type |= SHIFT_COUNT_1; break;
case '2': Type |= SHIFT_COUNT_2; break;
case '3': Type |= SHIFT_COUNT_3; break;
case '4': Type |= SHIFT_COUNT_4; break;
case '5': Type |= SHIFT_COUNT_5; break;
case '6': Type |= SHIFT_COUNT_6; break;
case '7': Type |= SHIFT_COUNT_7; break;
default: return SHIFT_NONE;
}
/* Make sure nothing follows */
if (Name[6] == '\0') {
return Type;
} else {
return SHIFT_NONE;
}
}
/*****************************************************************************/
/* Optimize shifts */
/*****************************************************************************/ /*****************************************************************************/
@ -85,6 +207,8 @@ unsigned OptShift1 (CodeSeg* S)
I = 0; I = 0;
while (I < CS_GetEntryCount (S)) { while (I < CS_GetEntryCount (S)) {
unsigned Shift;
unsigned Count;
CodeEntry* N; CodeEntry* N;
CodeEntry* X; CodeEntry* X;
CodeLabel* L; CodeLabel* L;
@ -93,16 +217,14 @@ unsigned OptShift1 (CodeSeg* S)
CodeEntry* E = CS_GetEntry (S, I); CodeEntry* E = CS_GetEntry (S, I);
/* Check for the sequence */ /* Check for the sequence */
if (E->OPC == OP65_JSR && if (E->OPC == OP65_JSR &&
(strncmp (E->Arg, "shlax", 5) == 0 || (Shift = GetShift (E->Arg)) != SHIFT_NONE &&
strncmp (E->Arg, "aslax", 5) == 0) && SHIFT_DIR (Shift) == SHIFT_DIR_LEFT &&
strlen (E->Arg) == 6 && (Count = SHIFT_COUNT (Shift)) > 0) {
IsDigit (E->Arg[5])) {
if (!RegXUsed (S, I+1)) { if (!RegXUsed (S, I+1)) {
/* Insert shift insns */ /* Insert shift insns */
unsigned Count = E->Arg[5] - '0';
while (Count--) { while (Count--) {
X = NewCodeEntry (OP65_ASL, AM65_ACC, "a", 0, E->LI); X = NewCodeEntry (OP65_ASL, AM65_ACC, "a", 0, E->LI);
CS_InsertEntry (S, X, I+1); CS_InsertEntry (S, X, I+1);
@ -115,7 +237,7 @@ unsigned OptShift1 (CodeSeg* S)
++Changes; ++Changes;
} else if (E->RI->In.RegX == 0 && } else if (E->RI->In.RegX == 0 &&
E->Arg[5] == '1' && Count == 1 &&
(N = CS_GetNextEntry (S, I)) != 0) { (N = CS_GetNextEntry (S, I)) != 0) {
/* asl a */ /* asl a */
@ -167,17 +289,17 @@ unsigned OptShift2(CodeSeg* S)
I = 0; I = 0;
while (I < CS_GetEntryCount (S)) { while (I < CS_GetEntryCount (S)) {
unsigned Shift;
unsigned Count; unsigned Count;
/* Get next entry */ /* Get next entry */
CodeEntry* E = CS_GetEntry (S, I); CodeEntry* E = CS_GetEntry (S, I);
/* Check for the sequence */ /* Check for the sequence */
if (E->OPC == OP65_JSR && if (E->OPC == OP65_JSR &&
strncmp (E->Arg, "asrax", 5) == 0 && (Shift = GetShift (E->Arg)) != SHIFT_NONE &&
strlen (E->Arg) == 6 && SHIFT_TYPE (Shift) == SHIFT_TYPE_ASR &&
IsDigit (E->Arg[5]) && (Count = SHIFT_COUNT (Shift)) > 0 &&
(Count = (E->Arg[5] - '0')) >= 1 &&
Count * 100 <= S->CodeSizeFactor && Count * 100 <= S->CodeSizeFactor &&
!RegXUsed (S, I+1)) { !RegXUsed (S, I+1)) {
@ -238,6 +360,8 @@ unsigned OptShift3 (CodeSeg* S)
I = 0; I = 0;
while (I < CS_GetEntryCount (S)) { while (I < CS_GetEntryCount (S)) {
unsigned Shift;
unsigned Count;
CodeEntry* L[3]; CodeEntry* L[3];
/* Get next entry */ /* Get next entry */
@ -252,17 +376,15 @@ unsigned OptShift3 (CodeSeg* S)
L[0]->JumpTo->Owner == L[2] && L[0]->JumpTo->Owner == L[2] &&
!CS_RangeHasLabel (S, I, 2) && !CS_RangeHasLabel (S, I, 2) &&
L[2]->OPC == OP65_JSR && L[2]->OPC == OP65_JSR &&
strlen (L[2]->Arg) == 6 && (Shift = GetShift (L[2]->Arg)) != SHIFT_NONE &&
memcmp (L[2]->Arg, "shrax", 5) == 0 && SHIFT_TYPE (Shift) == SHIFT_TYPE_ASR &&
IsDigit (L[2]->Arg[5]) && (Count = SHIFT_COUNT (Shift)) > 0 &&
!RegXUsed (S, I+3)) { !RegXUsed (S, I+3)) {
unsigned ShiftCount = (L[2]->Arg[5] - '0');
/* Add the replacement insn instead */ /* Add the replacement insn instead */
CodeEntry* X = NewCodeEntry (OP65_ROR, AM65_ACC, "a", 0, L[2]->LI); CodeEntry* X = NewCodeEntry (OP65_ROR, AM65_ACC, "a", 0, L[2]->LI);
CS_InsertEntry (S, X, I+3); CS_InsertEntry (S, X, I+3);
while (--ShiftCount) { while (--Count) {
X = NewCodeEntry (OP65_LSR, AM65_ACC, "a", 0, L[2]->LI); X = NewCodeEntry (OP65_LSR, AM65_ACC, "a", 0, L[2]->LI);
CS_InsertEntry (S, X, I+4); CS_InsertEntry (S, X, I+4);
} }
@ -298,23 +420,58 @@ unsigned OptShift4 (CodeSeg* S)
I = 0; I = 0;
while (I < CS_GetEntryCount (S)) { while (I < CS_GetEntryCount (S)) {
unsigned Shift;
unsigned Count;
/* Get next entry */ /* Get next entry */
CodeEntry* E = CS_GetEntry (S, I); CodeEntry* E = CS_GetEntry (S, I);
/* Check for the sequence */ /* Check for the sequence */
if (E->OPC == OP65_JSR && if (E->OPC == OP65_JSR &&
(strncmp (E->Arg, "shrax", 5) == 0 || (Shift = GetShift (E->Arg)) != SHIFT_NONE &&
strncmp (E->Arg, "asrax", 5) == 0) && SHIFT_DIR (Shift) == SHIFT_DIR_RIGHT &&
strlen (E->Arg) == 6 &&
IsDigit (E->Arg[5]) &&
E->RI->In.RegX == 0) { E->RI->In.RegX == 0) {
/* Insert shift insns */ CodeEntry* X;
unsigned Count = E->Arg[5] - '0';
while (Count--) { /* Shift count may be in Y */
CodeEntry* X = NewCodeEntry (OP65_LSR, AM65_ACC, "a", 0, E->LI); Count = SHIFT_COUNT (Shift);
CS_InsertEntry (S, X, I+1); if (Count == SHIFT_COUNT_Y) {
}
/* Generate:
*
* L1: lsr a
* dey
* bpl L1
* rol a
*/
CodeLabel* L;
/* lsr a */
X = NewCodeEntry (OP65_LSR, AM65_ACC, "a", 0, E->LI);
CS_InsertEntry (S, X, I+1);
L = CS_GenLabel (S, X);
/* dey */
X = NewCodeEntry (OP65_DEY, AM65_IMP, 0, 0, E->LI);
CS_InsertEntry (S, X, I+2);
/* bpl L1 */
X = NewCodeEntry (OP65_BPL, AM65_BRA, L->Name, L, E->LI);
CS_InsertEntry (S, X, I+3);
/* rol a */
X = NewCodeEntry (OP65_ROL, AM65_ACC, "a", 0, E->LI);
CS_InsertEntry (S, X, I+4);
} else {
/* Insert shift insns */
while (Count--) {
X = NewCodeEntry (OP65_LSR, AM65_ACC, "a", 0, E->LI);
CS_InsertEntry (S, X, I+1);
}
}
/* Delete the call to shrax */ /* Delete the call to shrax */
CS_DelEntry (S, I); CS_DelEntry (S, I);
@ -335,27 +492,6 @@ unsigned OptShift4 (CodeSeg* S)
static unsigned GetShiftType (const char* Sub)
/* Helper function for OptShift5 */
{
if (*Sub == 'a') {
if (strcmp (Sub+1, "slax1") == 0) {
return SHIFT_ASL_1;
} else if (strcmp (Sub+1, "srax1") == 0) {
return SHIFT_ASR_1;
}
} else if (*Sub == 's') {
if (strcmp (Sub+1, "hlax1") == 0) {
return SHIFT_LSL_1;
} else if (strcmp (Sub+1, "hrax1") == 0) {
return SHIFT_LSR_1;
}
}
return SHIFT_NONE;
}
unsigned OptShift5 (CodeSeg* S) unsigned OptShift5 (CodeSeg* S)
/* Search for the sequence /* Search for the sequence
* *
@ -397,7 +533,8 @@ unsigned OptShift5 (CodeSeg* S)
L[1]->OPC == OP65_LDX && L[1]->OPC == OP65_LDX &&
(L[1]->AM == AM65_ABS || L[1]->AM == AM65_ZP) && (L[1]->AM == AM65_ABS || L[1]->AM == AM65_ZP) &&
L[2]->OPC == OP65_JSR && L[2]->OPC == OP65_JSR &&
(ShiftType = GetShiftType (L[2]->Arg)) != SHIFT_NONE&& (ShiftType = GetShift (L[2]->Arg)) != SHIFT_NONE &&
SHIFT_COUNT(ShiftType) == 1 &&
L[3]->OPC == OP65_STA && L[3]->OPC == OP65_STA &&
(L[3]->AM == AM65_ABS || L[3]->AM == AM65_ZP) && (L[3]->AM == AM65_ABS || L[3]->AM == AM65_ZP) &&
L[4]->OPC == OP65_STX && L[4]->OPC == OP65_STX &&
@ -486,6 +623,8 @@ unsigned OptShift6 (CodeSeg* S)
unsigned I = 0; unsigned I = 0;
while (I < CS_GetEntryCount (S)) { while (I < CS_GetEntryCount (S)) {
unsigned Shift;
unsigned Count;
CodeEntry* X; CodeEntry* X;
unsigned IP; unsigned IP;
@ -494,13 +633,9 @@ unsigned OptShift6 (CodeSeg* S)
/* Check for a call to one of the shift routine */ /* Check for a call to one of the shift routine */
if (E->OPC == OP65_JSR && if (E->OPC == OP65_JSR &&
(strncmp (E->Arg, "shlax", 5) == 0 || (Shift = GetShift (E->Arg)) != SHIFT_NONE &&
strncmp (E->Arg, "aslax", 5) == 0) && SHIFT_DIR (Shift) == SHIFT_DIR_LEFT &&
strlen (E->Arg) == 6 && (Count = SHIFT_COUNT (Shift)) > 0) {
IsDigit (E->Arg[5])) {
/* Get number of shifts */
unsigned ShiftCount = (E->Arg[5] - '0');
/* Code is: /* Code is:
* *
@ -516,8 +651,8 @@ unsigned OptShift6 (CodeSeg* S)
* and replaces a txa, so for a shift count of 1, we get a factor * and replaces a txa, so for a shift count of 1, we get a factor
* of 200, which matches nicely the CodeSizeFactor enabled with -Oi * of 200, which matches nicely the CodeSizeFactor enabled with -Oi
*/ */
if (ShiftCount > 1 || S->CodeSizeFactor > 200) { if (Count > 1 || S->CodeSizeFactor > 200) {
unsigned Size = 4 + 3 * ShiftCount; unsigned Size = 4 + 3 * Count;
if ((Size * 100 / 3) > S->CodeSizeFactor) { if ((Size * 100 / 3) > S->CodeSizeFactor) {
/* Not acceptable */ /* Not acceptable */
goto NextEntry; goto NextEntry;
@ -531,7 +666,7 @@ unsigned OptShift6 (CodeSeg* S)
X = NewCodeEntry (OP65_STX, AM65_ZP, "tmp1", 0, E->LI); X = NewCodeEntry (OP65_STX, AM65_ZP, "tmp1", 0, E->LI);
CS_InsertEntry (S, X, IP++); CS_InsertEntry (S, X, IP++);
while (ShiftCount--) { while (Count--) {
/* asl a */ /* asl a */
X = NewCodeEntry (OP65_ASL, AM65_ACC, "a", 0, E->LI); X = NewCodeEntry (OP65_ASL, AM65_ACC, "a", 0, E->LI);
CS_InsertEntry (S, X, IP++); CS_InsertEntry (S, X, IP++);