X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?p=rmac;a=blobdiff_plain;f=amode.c;h=c930a9695269b2787e872b82a7ceb424e599e136;hp=175fe73fdaf79cd27012da9d48445bc58c2e4bef;hb=c38505ee4b2a0de59926107e52fb8bb84041a0e4;hpb=0951a3e28907fbaf89a10c5201b71d8080ffe5a8 diff --git a/amode.c b/amode.c index 175fe73..c930a96 100644 --- a/amode.c +++ b/amode.c @@ -1,7 +1,7 @@ // // RMAC - Reboot's Macro Assembler for all Atari computers // AMODE.C - Addressing Modes -// Copyright (C) 199x Landon Dyer, 2011-2017 Reboot and Friends +// Copyright (C) 199x Landon Dyer, 2011-2020 Reboot and Friends // RMAC derived from MADMAC v1.07 Written by Landon Dyer, 1986 // Source utilised with the kind permission of Landon Dyer // @@ -72,7 +72,7 @@ WORD bf0exattr; // Expression's attribute SYM * bf0esym; // External symbol involved in expr // Function prototypes -int check030bf(void); +int Check030Bitfield(void); // @@ -132,7 +132,7 @@ int amode(int acount) // it's a bitfield instruction--check the parameters inside the {} block // for validity if (*tok == '{') - if (check030bf() == ERROR) + if (Check030Bitfield() == ERROR) return ERROR; if ((acount == 0) || (*tok != ',')) @@ -170,7 +170,7 @@ int amode(int acount) // It's a bitfield instruction--check the parameters inside the {} block // for validity if (*tok == '{') - if (check030bf() == ERROR) + if (Check030Bitfield() == ERROR) return ERROR; // At this point, it is legal for 020+ to have a ':'. For example divu.l @@ -184,13 +184,9 @@ int amode(int acount) tok++; //eat the colon if ((*tok >= KW_D0) && (*tok <= KW_D7)) - { a2reg = (*tok++) & 7; - } else if ((*tok >= KW_FP0) && (*tok <= KW_FP7)) - { a2reg = (*tok++) & 7; - } else return error("a data or FPU register must follow a :"); } @@ -207,9 +203,6 @@ int amode(int acount) // Error messages: badmode: return error("addressing mode syntax"); - - //unmode: - //return error("unimplemented addressing mode"); } @@ -376,7 +369,7 @@ int fpu_reglist_right(WORD * a_rmask) // bfxxx {param1,param2} // param1/2 are either data registers or immediate values // -int check030bf(void) +int Check030Bitfield(void) { PTR tp; CHECK00;