X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=src%2Fcc65%2Fcodeinfo.c;h=322b471ff0e8109a9bfb0d906d870ff67a7cb614;hb=4a667ead00c10797fb57298b3dd33c2efc6c8d3f;hp=5014e71a4f1c8e179c848a2871d16633b8c194ec;hpb=c6fe12ef6bfd75b228d38d4b7639e399a9b98b49;p=cc65 diff --git a/src/cc65/codeinfo.c b/src/cc65/codeinfo.c index 5014e71a4..322b471ff 100644 --- a/src/cc65/codeinfo.c +++ b/src/cc65/codeinfo.c @@ -72,6 +72,8 @@ struct FuncInfo { }; static const FuncInfo FuncInfoTable[] = { + { "addeq0sp", REG_AX, REG_AXY }, + { "addeqysp", REG_AXY, REG_AXY }, { "addysp", REG_Y, REG_NONE }, { "aslax1", REG_AX, REG_AX | REG_TMP1 }, { "aslax2", REG_AX, REG_AX | REG_TMP1 }, @@ -122,25 +124,50 @@ static const FuncInfo FuncInfoTable[] = { { "laddeq", REG_EAXY|REG_PTR1_LO, REG_EAXY | REG_PTR1_HI }, { "laddeq1", REG_Y | REG_PTR1_LO, REG_EAXY | REG_PTR1_HI }, { "laddeqa", REG_AY | REG_PTR1_LO, REG_EAXY | REG_PTR1_HI }, + { "laddeq0sp", REG_EAX, REG_EAXY }, + { "laddeqysp", REG_EAXY, REG_EAXY }, { "ldaidx", REG_AXY, REG_AX | REG_PTR1 }, { "ldauidx", REG_AXY, REG_AX | REG_PTR1 }, - { "ldax0sp", REG_Y, REG_AX }, + { "ldax0sp", REG_NONE, REG_AXY }, { "ldaxi", REG_AX, REG_AXY | REG_PTR1 }, { "ldaxidx", REG_AXY, REG_AXY | REG_PTR1 }, { "ldaxysp", REG_Y, REG_AXY }, + { "ldeax0sp", REG_NONE, REG_EAXY }, + { "ldeaxi", REG_AX, REG_EAXY | REG_PTR1 }, + { "ldeaxidx", REG_AXY, REG_EAXY | REG_PTR1 }, + { "ldeaxysp", REG_Y, REG_EAXY }, { "leaasp", REG_A, REG_AX }, { "lsubeq", REG_EAXY|REG_PTR1_LO, REG_EAXY | REG_PTR1_HI }, { "lsubeq0sp", REG_EAX, REG_EAXY }, { "lsubeq1", REG_Y | REG_PTR1_LO, REG_EAXY | REG_PTR1_HI }, { "lsubeqa", REG_AY | REG_PTR1_LO, REG_EAXY | REG_PTR1_HI }, { "lsubeqysp", REG_EAXY, REG_EAXY }, + { "lsubeq0sp", REG_EAX, REG_EAXY }, { "negax", REG_AX, REG_AX }, + { "push0", REG_NONE, REG_AXY }, + { "push1", REG_NONE, REG_AXY }, + { "push2", REG_NONE, REG_AXY }, + { "push3", REG_NONE, REG_AXY }, + { "push4", REG_NONE, REG_AXY }, + { "push5", REG_NONE, REG_AXY }, + { "push6", REG_NONE, REG_AXY }, + { "push7", REG_NONE, REG_AXY }, { "pusha", REG_A, REG_Y }, { "pusha0", REG_A, REG_XY }, + { "pusha0sp", REG_NONE, REG_AY }, { "pushax", REG_AX, REG_Y }, + { "pushaysp", REG_Y, REG_AY }, + { "pushc0", REG_NONE, REG_A | REG_Y }, + { "pushc1", REG_NONE, REG_A | REG_Y }, + { "pushc2", REG_NONE, REG_A | REG_Y }, { "pusheax", REG_EAX, REG_Y }, + { "pushw", REG_AX, REG_AXY | REG_PTR1 }, { "pushw0sp", REG_NONE, REG_AXY }, + { "pushwidx", REG_AXY, REG_AXY | REG_PTR1 }, { "pushwysp", REG_Y, REG_AXY }, + { "regswap", REG_AXY, REG_AXY | REG_TMP1 }, + { "regswap1", REG_XY, REG_A }, + { "regswap2", REG_XY, REG_A | REG_Y }, { "shlax1", REG_AX, REG_AX | REG_TMP1 }, { "shlax2", REG_AX, REG_AX | REG_TMP1 }, { "shlax3", REG_AX, REG_AX | REG_TMP1 }, @@ -156,18 +183,21 @@ static const FuncInfo FuncInfoTable[] = { { "staspidx", REG_A | REG_Y, REG_Y | REG_TMP1 | REG_PTR1 }, { "stax0sp", REG_AX, REG_Y }, { "staxysp", REG_AXY, REG_Y }, + { "steax0sp", REG_EAX, REG_Y }, + { "steaxysp", REG_EAXY, REG_Y }, { "subeq0sp", REG_AX, REG_AXY }, { "subeqysp", REG_AXY, REG_AXY }, - { "tsteax", REG_EAX, REG_Y }, { "tosadda0", REG_A, REG_AXY }, { "tosaddax", REG_AX, REG_AXY }, - { "tosicmp", REG_AX, REG_AXY | REG_SREG }, - { "tosdiva0", REG_AX, REG_ALL }, - { "tosdivax", REG_AX, REG_ALL }, - { "tosdiveax", REG_EAX, REG_ALL }, + { "tosanda0", REG_A, REG_AXY }, + { "tosandax", REG_AX, REG_AXY }, + { "tosdiva0", REG_AY, REG_ALL }, + { "tosdivax", REG_AXY, REG_ALL }, + { "tosdiveax", REG_EAXY, REG_ALL }, { "toseqeax", REG_EAX, REG_AXY | REG_PTR1 }, { "tosgeeax", REG_EAX, REG_AXY | REG_PTR1 }, { "tosgteax", REG_EAX, REG_AXY | REG_PTR1 }, + { "tosicmp", REG_AX, REG_AXY | REG_SREG }, { "toslcmp", REG_EAX, REG_A | REG_Y | REG_PTR1 }, { "tosleeax", REG_EAX, REG_AXY | REG_PTR1 }, { "toslteax", REG_EAX, REG_AXY | REG_PTR1 }, @@ -186,6 +216,7 @@ static const FuncInfo FuncInfoTable[] = { { "tosumula0", REG_AX, REG_ALL }, { "tosumulax", REG_AX, REG_ALL }, { "tosumuleax", REG_EAX, REG_ALL }, + { "tsteax", REG_EAX, REG_Y }, { "utsteax", REG_EAX, REG_Y }, }; #define FuncInfoCount (sizeof(FuncInfoTable) / sizeof(FuncInfoTable[0])) @@ -256,8 +287,7 @@ void GetFuncInfo (const char* Name, unsigned short* Use, unsigned short* Chg) FuncDesc* D = E->V.F.Func; if ((D->Flags & FD_FASTCALL) != 0 && D->ParamCount > 0) { /* Will use registers depending on the last param */ - SymEntry* LastParam = D->SymTab->SymTail; - unsigned LastParamSize = CheckedSizeOf (LastParam->Type); + unsigned LastParamSize = CheckedSizeOf (D->LastParam->Type); if (LastParamSize == 1) { *Use = REG_A; } else if (LastParamSize == 2) { @@ -564,6 +594,14 @@ int RegAXUsed (struct CodeSeg* S, unsigned Index) +int RegEAXUsed (struct CodeSeg* S, unsigned Index) +/* Check if any of the four bytes in EAX are used. */ +{ + return (GetRegInfo (S, Index, REG_EAX) & REG_EAX) != 0; +} + + + unsigned GetKnownReg (unsigned Use, const RegContents* RC) /* Return the register or zero page location from the set in Use, thats * contents are known. If Use does not contain any register, or if the @@ -578,6 +616,10 @@ unsigned GetKnownReg (unsigned Use, const RegContents* RC) return (RC == 0 || RC->RegY >= 0)? REG_Y : REG_NONE; } else if ((Use & REG_TMP1) != 0) { return (RC == 0 || RC->Tmp1 >= 0)? REG_TMP1 : REG_NONE; + } else if ((Use & REG_PTR1_LO) != 0) { + return (RC == 0 || RC->Ptr1Lo >= 0)? REG_PTR1_LO : REG_NONE; + } else if ((Use & REG_PTR1_HI) != 0) { + return (RC == 0 || RC->Ptr1Hi >= 0)? REG_PTR1_HI : REG_NONE; } else if ((Use & REG_SREG_LO) != 0) { return (RC == 0 || RC->SRegLo >= 0)? REG_SREG_LO : REG_NONE; } else if ((Use & REG_SREG_HI) != 0) { @@ -587,7 +629,7 @@ unsigned GetKnownReg (unsigned Use, const RegContents* RC) } } - + static cmp_t FindCmpCond (const char* Code, unsigned CodeLen) /* Search for a compare condition by the given code using the given length */