6502/cc65
1
0
Fork 0
mirror of https://github.com/cc65/cc65.git synced 2024-12-26 08:32:00 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2074 from bbbradsmith/zp_override_not_suspicious

Browse Source 
Explicit z: should suppress "Suspicious address expression" warning
This commit is contained in:
Bob Andrews 2023-05-03 14:09:23 +02:00 committed by GitHub
commit f3c0f7c6ce
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/ca65/ea.h
View File

@ -43,6 +43,10 @@
/*****************************************************************************/ /*****************************************************************************/
/* EffAddr Flags */
#define EFFADDR_OVERRIDE_ZP 0x00000001UL
/* GetEA result struct */ /* GetEA result struct */
typedef struct EffAddr EffAddr; typedef struct EffAddr EffAddr;
@ -51,6 +55,7 @@ struct EffAddr {
unsigned long AddrModeSet; /* Possible addressing modes */ unsigned long AddrModeSet; /* Possible addressing modes */
struct ExprNode* Expr; /* Expression if any (NULL otherwise) */ struct ExprNode* Expr; /* Expression if any (NULL otherwise) */
unsigned Reg; /* Register number in sweet16 mode */ unsigned Reg; /* Register number in sweet16 mode */
unsigned long Flags; /* Other properties */
/* The following fields are used inside instr.c */ /* The following fields are used inside instr.c */
unsigned AddrMode; /* Actual addressing mode used */ unsigned AddrMode; /* Actual addressing mode used */

2
src/ca65/ea65.c
View File

@ -72,11 +72,13 @@ void GetEA (EffAddr* A)
/* Clear the output struct */ /* Clear the output struct */
A->AddrModeSet = 0; A->AddrModeSet = 0;
A->Expr = 0; A->Expr = 0;
A->Flags = 0;
/* Handle an addressing size override */ /* Handle an addressing size override */
switch (CurTok.Tok) { switch (CurTok.Tok) {
case TOK_OVERRIDE_ZP: case TOK_OVERRIDE_ZP:
Restrictions = AM65_DIR | AM65_DIR_X | AM65_DIR_Y; Restrictions = AM65_DIR | AM65_DIR_X | AM65_DIR_Y;
A->Flags |= EFFADDR_OVERRIDE_ZP;
NextTok (); NextTok ();
break; break;

3
src/ca65/instr.c
View File

@ -1269,7 +1269,8 @@ static int EvalEA (const InsDesc* Ins, EffAddr* A)
ExprNode* Left = A->Expr->Left; ExprNode* Left = A->Expr->Left;
if ((A->Expr->Op == EXPR_BYTE0 || A->Expr->Op == EXPR_BYTE1) && if ((A->Expr->Op == EXPR_BYTE0 || A->Expr->Op == EXPR_BYTE1) &&
Left->Op == EXPR_SYMBOL && Left->Op == EXPR_SYMBOL &&
GetSymAddrSize (Left->V.Sym) != ADDR_SIZE_ZP) { GetSymAddrSize (Left->V.Sym) != ADDR_SIZE_ZP &&
!(A->Flags & EFFADDR_OVERRIDE_ZP)) {
/* Output a warning */ /* Output a warning */
Warning (1, "Suspicious address expression"); Warning (1, "Suspicious address expression");