From 28f891dc1fa0713670e5d765a227a235d0142af4 Mon Sep 17 00:00:00 2001 From: Olaf Seibert Date: Fri, 22 Jan 2021 18:26:07 +0100 Subject: [PATCH] Correct name of OC_[12]FIS to OC_FPP{ACGEN,GENAC}. --- assemble.c | 4 ++-- symbols.c | 58 +++++++++++++++++++++++++++--------------------------- symbols.h | 8 ++++---- 3 files changed, 35 insertions(+), 35 deletions(-) diff --git a/assemble.c b/assemble.c index 22ad384..6257542 100644 --- a/assemble.c +++ b/assemble.c @@ -1605,7 +1605,7 @@ static int assemble( } return 1; - case OC_1FIS: + case OC_FPPGENAC: /* One one gen and one reg 0-3 */ { ADDR_MODE mode; EX_TREE *value; @@ -1645,7 +1645,7 @@ static int assemble( } return 1; - case OC_2FIS: + case OC_FPPACGEN: /* One reg 0-3 and one gen */ { ADDR_MODE mode; EX_TREE *value; diff --git a/symbols.c b/symbols.c index 63693ca..3a344eb 100644 --- a/symbols.c +++ b/symbols.c @@ -416,28 +416,28 @@ void add_symbols( add_sym("ABSD", I_ABSD, OC_1GEN, &instruction_section, &system_st); add_sym("ABSF", I_ABSF, OC_1GEN, &instruction_section, &system_st); - add_sym("ADDD", I_ADDD, OC_1FIS, &instruction_section, &system_st); - add_sym("ADDF", I_ADDF, OC_1FIS, &instruction_section, &system_st); + add_sym("ADDD", I_ADDD, OC_FPPGENAC, &instruction_section, &system_st); + add_sym("ADDF", I_ADDF, OC_FPPGENAC, &instruction_section, &system_st); add_sym("CFCC", I_CFCC, OC_NONE, &instruction_section, &system_st); add_sym("CLRD", I_CLRD, OC_1GEN, &instruction_section, &system_st); add_sym("CLRF", I_CLRF, OC_1GEN, &instruction_section, &system_st); - add_sym("CMPD", I_CMPD, OC_1FIS, &instruction_section, &system_st); - add_sym("CMPF", I_CMPF, OC_1FIS, &instruction_section, &system_st); - add_sym("DIVD", I_DIVD, OC_1FIS, &instruction_section, &system_st); - add_sym("DIVF", I_DIVF, OC_1FIS, &instruction_section, &system_st); - add_sym("LDCDF", I_LDCDF, OC_1FIS, &instruction_section, &system_st); - add_sym("LDCID", I_LDCID, OC_1FIS, &instruction_section, &system_st); - add_sym("LDCIF", I_LDCIF, OC_1FIS, &instruction_section, &system_st); - add_sym("LDCLD", I_LDCLD, OC_1FIS, &instruction_section, &system_st); - add_sym("LDCLF", I_LDCLF, OC_1FIS, &instruction_section, &system_st); - add_sym("LDD", I_LDD, OC_1FIS, &instruction_section, &system_st); - add_sym("LDEXP", I_LDEXP, OC_1FIS, &instruction_section, &system_st); - add_sym("LDF", I_LDF, OC_1FIS, &instruction_section, &system_st); + add_sym("CMPD", I_CMPD, OC_FPPGENAC, &instruction_section, &system_st); + add_sym("CMPF", I_CMPF, OC_FPPGENAC, &instruction_section, &system_st); + add_sym("DIVD", I_DIVD, OC_FPPGENAC, &instruction_section, &system_st); + add_sym("DIVF", I_DIVF, OC_FPPGENAC, &instruction_section, &system_st); + add_sym("LDCDF", I_LDCDF, OC_FPPGENAC, &instruction_section, &system_st); + add_sym("LDCID", I_LDCID, OC_FPPGENAC, &instruction_section, &system_st); + add_sym("LDCIF", I_LDCIF, OC_FPPGENAC, &instruction_section, &system_st); + add_sym("LDCLD", I_LDCLD, OC_FPPGENAC, &instruction_section, &system_st); + add_sym("LDCLF", I_LDCLF, OC_FPPGENAC, &instruction_section, &system_st); + add_sym("LDD", I_LDD, OC_FPPGENAC, &instruction_section, &system_st); + add_sym("LDEXP", I_LDEXP, OC_FPPGENAC, &instruction_section, &system_st); + add_sym("LDF", I_LDF, OC_FPPGENAC, &instruction_section, &system_st); add_sym("LDFPS", I_LDFPS, OC_1GEN, &instruction_section, &system_st); - add_sym("MODD", I_MODD, OC_1FIS, &instruction_section, &system_st); - add_sym("MODF", I_MODF, OC_1FIS, &instruction_section, &system_st); - add_sym("MULD", I_MULD, OC_1FIS, &instruction_section, &system_st); - add_sym("MULF", I_MULF, OC_1FIS, &instruction_section, &system_st); + add_sym("MODD", I_MODD, OC_FPPGENAC, &instruction_section, &system_st); + add_sym("MODF", I_MODF, OC_FPPGENAC, &instruction_section, &system_st); + add_sym("MULD", I_MULD, OC_FPPGENAC, &instruction_section, &system_st); + add_sym("MULF", I_MULF, OC_FPPGENAC, &instruction_section, &system_st); add_sym("NEGD", I_NEGD, OC_1GEN, &instruction_section, &system_st); add_sym("NEGF", I_NEGF, OC_1GEN, &instruction_section, &system_st); add_sym("SETD", I_SETD, OC_NONE, &instruction_section, &system_st); @@ -446,19 +446,19 @@ void add_symbols( add_sym("SETL", I_SETL, OC_NONE, &instruction_section, &system_st); add_sym("STA0", I_STA0, OC_NONE, &instruction_section, &system_st); add_sym("STB0", I_STB0, OC_NONE, &instruction_section, &system_st); - add_sym("STCDF", I_STCDF, OC_2FIS, &instruction_section, &system_st); - add_sym("STCDI", I_STCDI, OC_2FIS, &instruction_section, &system_st); - add_sym("STCDL", I_STCDL, OC_2FIS, &instruction_section, &system_st); - add_sym("STCFD", I_STCFD, OC_2FIS, &instruction_section, &system_st); - add_sym("STCFI", I_STCFI, OC_2FIS, &instruction_section, &system_st); - add_sym("STCFL", I_STCFL, OC_2FIS, &instruction_section, &system_st); - add_sym("STD", I_STD, OC_2FIS, &instruction_section, &system_st); - add_sym("STEXP", I_STEXP, OC_2FIS, &instruction_section, &system_st); - add_sym("STF", I_STF, OC_2FIS, &instruction_section, &system_st); + add_sym("STCDF", I_STCDF, OC_FPPACGEN, &instruction_section, &system_st); + add_sym("STCDI", I_STCDI, OC_FPPACGEN, &instruction_section, &system_st); + add_sym("STCDL", I_STCDL, OC_FPPACGEN, &instruction_section, &system_st); + add_sym("STCFD", I_STCFD, OC_FPPACGEN, &instruction_section, &system_st); + add_sym("STCFI", I_STCFI, OC_FPPACGEN, &instruction_section, &system_st); + add_sym("STCFL", I_STCFL, OC_FPPACGEN, &instruction_section, &system_st); + add_sym("STD", I_STD, OC_FPPACGEN, &instruction_section, &system_st); + add_sym("STEXP", I_STEXP, OC_FPPACGEN, &instruction_section, &system_st); + add_sym("STF", I_STF, OC_FPPACGEN, &instruction_section, &system_st); add_sym("STFPS", I_STFPS, OC_1GEN, &instruction_section, &system_st); add_sym("STST", I_STST, OC_1GEN, &instruction_section, &system_st); - add_sym("SUBD", I_SUBD, OC_1FIS, &instruction_section, &system_st); - add_sym("SUBF", I_SUBF, OC_1FIS, &instruction_section, &system_st); + add_sym("SUBD", I_SUBD, OC_FPPGENAC, &instruction_section, &system_st); + add_sym("SUBF", I_SUBF, OC_FPPGENAC, &instruction_section, &system_st); add_sym("TSTD", I_TSTD, OC_1GEN, &instruction_section, &system_st); add_sym("TSTF", I_TSTF, OC_1GEN, &instruction_section, &system_st); diff --git a/symbols.h b/symbols.h index de2bf7c..0003a2d 100644 --- a/symbols.h +++ b/symbols.h @@ -279,10 +279,10 @@ enum operand_codes { OC_MASK = 0xff00, /* FADD, FSUB, FMUL, FDIV, RTS */ OC_SOB = 0x0800, /* SOB */ - OC_1FIS = 0x0900, - /* FIS (reg, gen) */ - OC_2FIS = 0x0a00, - /* FIS (gen, reg) */ + OC_FPPGENAC = 0x0900, + /* FPP (gen, floating ac 0-3) */ + OC_FPPACGEN = 0x0a00, + /* FPP (floating ac 0-3, gen) */ OC__LAST = 0xff00 };