Skip to content

Commit

Permalink
Added mnemo info file directive
Browse files Browse the repository at this point in the history 
And for 68HC11, added boppcom option
  • Loading branch information
@Arakula
Arakula committed Oct 10, 2022
1 parent 52a1a6b commit 7b897ba
Show file tree
Hide file tree
Showing 23 changed files with 1,598 additions and 1,369 deletions.
143 changes: 71 additions & 72 deletions Dasm6301.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,72 +57,72 @@ static bool bRegistered[] =
/* m6301_codes : table of all 6301 instruction bytes and types */
/*****************************************************************************/

uint8_t Dasm6301::h6301_codes[512] =
CMatrixEntry Dasm6301::h6301_codes[256] =
{
_ill ,_nom, _nop ,_imp, _ill ,_nom, _ill ,_nom, /* 00..03 */
_lsrd ,_imp, _asld ,_imp, _tap ,_imp, _tpa ,_imp, /* 04..07 */
_inx ,_imp, _dex ,_imp, _clv ,_imp, _sev ,_imp, /* 08..0B */
_clc ,_imp, _sec ,_imp, _cli ,_imp, _sei ,_imp, /* 0C..0F */
_sba ,_imp, _cba ,_imp, _ill ,_nom, _ill ,_nom, /* 10..13 */
_ill ,_nom, _ill ,_nom, _tab ,_imp, _tba ,_imp, /* 14..17 */
_xgdx ,_imp, _daa ,_imp, _slp ,_imp, _aba ,_imp, /* 18..1B: extra 0x18/xgdx, 0x1a/slp */
_ill ,_nom, _ill ,_nom, _ill ,_nom, _ill ,_nom, /* 1C..1F */
_bra ,_reb, _brn ,_reb, _bhi ,_reb, _bls ,_reb, /* 20..23 */
_bcc ,_reb, _bcs ,_reb, _bne ,_reb, _beq ,_reb, /* 24..27 */
_bvc ,_reb, _bvs ,_reb, _bpl ,_reb, _bmi ,_reb, /* 28..2B */
_bge ,_reb, _blt ,_reb, _bgt ,_reb, _ble ,_reb, /* 2C..2F */
_tsx ,_imp, _ins ,_imp, _pula ,_imp, _pulb ,_imp, /* 30..33 */
_des ,_imp, _txs ,_imp, _psha ,_imp, _pshb ,_imp, /* 34..37 */
_pulx ,_imp, _rts ,_imp, _abx ,_imp, _rti ,_imp, /* 38..3B */
_pshx ,_imp, _mul ,_imp, _wai ,_imp, _swi ,_imp, /* 3C..3F */
_nega ,_imp, _ill ,_nom, _ill ,_nom, _coma ,_imp, /* 40..43 */
_lsra ,_imp, _ill ,_nom, _rora ,_imp, _asra ,_imp, /* 44..47 */
_asla ,_imp, _rola ,_imp, _deca ,_imp, _ill ,_nom, /* 48..4B */
_inca ,_imp, _tsta ,_imp, _ill ,_nom, _clra ,_imp, /* 4C..4F */
_negb ,_imp, _ill ,_nom, _ill ,_nom, _comb ,_imp, /* 50..53 */
_lsrb ,_imp, _ill ,_nom, _rorb ,_imp, _asrb ,_imp, /* 54..57 */
_aslb ,_imp, _rolb ,_imp, _decb ,_imp, _ill ,_nom, /* 58..5B */
_incb ,_imp, _tstb ,_imp, _ill ,_nom, _clrb ,_imp, /* 5C..5F */
_neg ,_ix8, _aim ,_bi, _oim ,_bi, _com ,_ix8, /* 60..63: extra 0x62/aim, 0x63/oim */
_lsr ,_ix8, _eim ,_bi, _ror ,_ix8, _asr ,_ix8, /* 64..67: extra 0x65/eim */
_asl ,_ix8, _rol ,_ix8, _dec ,_ix8, _tim ,_bi, /* 68..6B: extra 0x6b/tim */
_inc ,_ix8, _tst ,_ix8, _jmp ,_ix8, _clr ,_ix8, /* 6C..6F */
_neg ,_ext, _aim ,_bd, _oim ,_bd, _com ,_ext, /* 70..73: extra 0x72/aim, 0x73/oim */
_lsr ,_ext, _eim ,_bd, _ror ,_ext, _asr ,_ext, /* 74..77: extra 0x75/eim */
_asl ,_ext, _rol ,_ext, _dec ,_ext, _tim ,_bd, /* 78..7B: extra 0x7b/tim */
_inc ,_ext, _tst ,_ext, _jmp ,_ext, _clr ,_ext, /* 7C..7F */
_suba ,_imb, _cmpa ,_imb, _sbca ,_imb, _subd ,_imw, /* 80..83 */
_anda ,_imb, _bita ,_imb, _lda ,_imb, _ill ,_nom, /* 84..87 */
_eora ,_imb, _adca ,_imb, _ora ,_imb, _adda ,_imb, /* 88..8B */
_cpx ,_imw, _bsr ,_reb, _lds ,_imw, _ill ,_nom, /* 8C..8F */
_suba ,_dir, _cmpa ,_dir, _sbca ,_dir, _subd ,_dir, /* 90..93 */
_anda ,_dir, _bita ,_dir, _lda ,_dir, _sta ,_dir, /* 94..97 */
_eora ,_dir, _adca ,_dir, _ora ,_dir, _adda ,_dir, /* 98..9B */
_cpx ,_dir, _jsr ,_dir, _lds ,_dir, _sts ,_dir, /* 9C..9F */
_suba ,_ix8, _cmpa ,_ix8, _sbca ,_ix8, _subd ,_ix8, /* A0..A3 */
_anda ,_ix8, _bita ,_ix8, _lda ,_ix8, _sta ,_ix8, /* A4..A7 */
_eora ,_ix8, _adca ,_ix8, _ora ,_ix8, _adda ,_ix8, /* A8..AB */
_cpx ,_ix8, _jsr ,_ix8, _lds ,_ix8, _sts ,_ix8, /* AC..AF */
_suba ,_ext, _cmpa ,_ext, _sbca ,_ext, _subd ,_ext, /* B0..B3 */
_anda ,_ext, _bita ,_ext, _lda ,_ext, _sta ,_ext, /* B4..B7 */
_eora ,_ext, _adca ,_ext, _ora ,_ext, _adda ,_ext, /* B8..BB */
_cpx ,_ext, _jsr ,_ext, _lds ,_ext, _sts ,_ext, /* BC..BF */
_subb ,_imb, _cmpb ,_imb, _sbcb ,_imb, _addd ,_imw, /* C0..C3 */
_andb ,_imb, _bitb ,_imb, _ldb ,_imb, _ill ,_nom, /* C4..C7 */
_eorb ,_imb, _adcb ,_imb, _orb ,_imb, _addb ,_imb, /* C8..CB */
_ldd ,_imw, _ill ,_nom, _ldx ,_imw, _ill ,_nom, /* CC..CF */
_subb ,_dir, _cmpb ,_dir, _sbcb ,_dir, _addd ,_dir, /* D0..D3 */
_andb ,_dir, _bitb ,_dir, _ldb ,_dir, _stb ,_dir, /* D4..D7 */
_eorb ,_dir, _adcb ,_dir, _orb ,_dir, _addb ,_dir, /* D8..DB */
_ldd ,_dir, _std ,_dir, _ldx ,_dir, _stx ,_dir, /* DC..DF */
_subb ,_ix8, _cmpb ,_ix8, _sbcb ,_ix8, _addd ,_ix8, /* E0..E3 */
_andb ,_ix8, _bitb ,_ix8, _ldb ,_ix8, _stb ,_ix8, /* E4..E7 */
_eorb ,_ix8, _adcb ,_ix8, _orb ,_ix8, _addb ,_ix8, /* E8..EB */
_ldd ,_ix8, _std ,_ix8, _ldx ,_ix8, _stx ,_ix8, /* EC..EF */
_subb ,_ext, _cmpb ,_ext, _sbcb ,_ext, _addd ,_ext, /* F0..F3 */
_andb ,_ext, _bitb ,_ext, _ldb ,_ext, _stb ,_ext, /* F4..F7 */
_eorb ,_ext, _adcb ,_ext, _orb ,_ext, _addb ,_ext, /* F8..FB */
_ldd ,_ext, _std ,_ext, _ldx ,_ext, _stx ,_ext, /* FC..FF */
{_ill ,_nom}, {_nop ,_imp}, {_ill ,_nom}, {_ill ,_nom}, /* 00..03 */
{_lsrd ,_imp}, {_asld ,_imp}, {_tap ,_imp}, {_tpa ,_imp}, /* 04..07 */
{_inx ,_imp}, {_dex ,_imp}, {_clv ,_imp}, {_sev ,_imp}, /* 08..0B */
{_clc ,_imp}, {_sec ,_imp}, {_cli ,_imp}, {_sei ,_imp}, /* 0C..0F */
{_sba ,_imp}, {_cba ,_imp}, {_ill ,_nom}, {_ill ,_nom}, /* 10..13 */
{_ill ,_nom}, {_ill ,_nom}, {_tab ,_imp}, {_tba ,_imp}, /* 14..17 */
{_xgdx ,_imp}, {_daa ,_imp}, {_slp ,_imp}, {_aba ,_imp}, /* 18..1B: extra 0x18/xgdx, 0x1a/slp */
{_ill ,_nom}, {_ill ,_nom}, {_ill ,_nom}, {_ill ,_nom}, /* 1C..1F */
{_bra ,_reb}, {_brn ,_reb}, {_bhi ,_reb}, {_bls ,_reb}, /* 20..23 */
{_bcc ,_reb}, {_bcs ,_reb}, {_bne ,_reb}, {_beq ,_reb}, /* 24..27 */
{_bvc ,_reb}, {_bvs ,_reb}, {_bpl ,_reb}, {_bmi ,_reb}, /* 28..2B */
{_bge ,_reb}, {_blt ,_reb}, {_bgt ,_reb}, {_ble ,_reb}, /* 2C..2F */
{_tsx ,_imp}, {_ins ,_imp}, {_pula ,_imp}, {_pulb ,_imp}, /* 30..33 */
{_des ,_imp}, {_txs ,_imp}, {_psha ,_imp}, {_pshb ,_imp}, /* 34..37 */
{_pulx ,_imp}, {_rts ,_imp}, {_abx ,_imp}, {_rti ,_imp}, /* 38..3B */
{_pshx ,_imp}, {_mul ,_imp}, {_wai ,_imp}, {_swi ,_imp}, /* 3C..3F */
{_nega ,_imp}, {_ill ,_nom}, {_ill ,_nom}, {_coma ,_imp}, /* 40..43 */
{_lsra ,_imp}, {_ill ,_nom}, {_rora ,_imp}, {_asra ,_imp}, /* 44..47 */
{_asla ,_imp}, {_rola ,_imp}, {_deca ,_imp}, {_ill ,_nom}, /* 48..4B */
{_inca ,_imp}, {_tsta ,_imp}, {_ill ,_nom}, {_clra ,_imp}, /* 4C..4F */
{_negb ,_imp}, {_ill ,_nom}, {_ill ,_nom}, {_comb ,_imp}, /* 50..53 */
{_lsrb ,_imp}, {_ill ,_nom}, {_rorb ,_imp}, {_asrb ,_imp}, /* 54..57 */
{_aslb ,_imp}, {_rolb ,_imp}, {_decb ,_imp}, {_ill ,_nom}, /* 58..5B */
{_incb ,_imp}, {_tstb ,_imp}, {_ill ,_nom}, {_clrb ,_imp}, /* 5C..5F */
{_neg ,_ix8}, {_aim ,_bi }, {_oim ,_bi }, {_com ,_ix8}, /* 60..63: extra 0x62/aim, 0x63/oim */
{_lsr ,_ix8}, {_eim ,_bi }, {_ror ,_ix8}, {_asr ,_ix8}, /* 64..67: extra 0x65/eim */
{_asl ,_ix8}, {_rol ,_ix8}, {_dec ,_ix8}, {_tim ,_bi }, /* 68..6B: extra 0x6b/tim */
{_inc ,_ix8}, {_tst ,_ix8}, {_jmp ,_ix8}, {_clr ,_ix8}, /* 6C..6F */
{_neg ,_ext}, {_aim ,_bd }, {_oim ,_bd }, {_com ,_ext}, /* 70..73: extra 0x72/aim, 0x73/oim */
{_lsr ,_ext}, {_eim ,_bd }, {_ror ,_ext}, {_asr ,_ext}, /* 74..77: extra 0x75/eim */
{_asl ,_ext}, {_rol ,_ext}, {_dec ,_ext}, {_tim ,_bd }, /* 78..7B: extra 0x7b/tim */
{_inc ,_ext}, {_tst ,_ext}, {_jmp ,_ext}, {_clr ,_ext}, /* 7C..7F */
{_suba ,_imb}, {_cmpa ,_imb}, {_sbca ,_imb}, {_subd ,_imw}, /* 80..83 */
{_anda ,_imb}, {_bita ,_imb}, {_lda ,_imb}, {_ill ,_nom}, /* 84..87 */
{_eora ,_imb}, {_adca ,_imb}, {_ora ,_imb}, {_adda ,_imb}, /* 88..8B */
{_cpx ,_imw}, {_bsr ,_reb}, {_lds ,_imw}, {_ill ,_nom}, /* 8C..8F */
{_suba ,_dir}, {_cmpa ,_dir}, {_sbca ,_dir}, {_subd ,_dir}, /* 90..93 */
{_anda ,_dir}, {_bita ,_dir}, {_lda ,_dir}, {_sta ,_dir}, /* 94..97 */
{_eora ,_dir}, {_adca ,_dir}, {_ora ,_dir}, {_adda ,_dir}, /* 98..9B */
{_cpx ,_dir}, {_jsr ,_dir}, {_lds ,_dir}, {_sts ,_dir}, /* 9C..9F */
{_suba ,_ix8}, {_cmpa ,_ix8}, {_sbca ,_ix8}, {_subd ,_ix8}, /* A0..A3 */
{_anda ,_ix8}, {_bita ,_ix8}, {_lda ,_ix8}, {_sta ,_ix8}, /* A4..A7 */
{_eora ,_ix8}, {_adca ,_ix8}, {_ora ,_ix8}, {_adda ,_ix8}, /* A8..AB */
{_cpx ,_ix8}, {_jsr ,_ix8}, {_lds ,_ix8}, {_sts ,_ix8}, /* AC..AF */
{_suba ,_ext}, {_cmpa ,_ext}, {_sbca ,_ext}, {_subd ,_ext}, /* B0..B3 */
{_anda ,_ext}, {_bita ,_ext}, {_lda ,_ext}, {_sta ,_ext}, /* B4..B7 */
{_eora ,_ext}, {_adca ,_ext}, {_ora ,_ext}, {_adda ,_ext}, /* B8..BB */
{_cpx ,_ext}, {_jsr ,_ext}, {_lds ,_ext}, {_sts ,_ext}, /* BC..BF */
{_subb ,_imb}, {_cmpb ,_imb}, {_sbcb ,_imb}, {_addd ,_imw}, /* C0..C3 */
{_andb ,_imb}, {_bitb ,_imb}, {_ldb ,_imb}, {_ill ,_nom}, /* C4..C7 */
{_eorb ,_imb}, {_adcb ,_imb}, {_orb ,_imb}, {_addb ,_imb}, /* C8..CB */
{_ldd ,_imw}, {_ill ,_nom}, {_ldx ,_imw}, {_ill ,_nom}, /* CC..CF */
{_subb ,_dir}, {_cmpb ,_dir}, {_sbcb ,_dir}, {_addd ,_dir}, /* D0..D3 */
{_andb ,_dir}, {_bitb ,_dir}, {_ldb ,_dir}, {_stb ,_dir}, /* D4..D7 */
{_eorb ,_dir}, {_adcb ,_dir}, {_orb ,_dir}, {_addb ,_dir}, /* D8..DB */
{_ldd ,_dir}, {_std ,_dir}, {_ldx ,_dir}, {_stx ,_dir}, /* DC..DF */
{_subb ,_ix8}, {_cmpb ,_ix8}, {_sbcb ,_ix8}, {_addd ,_ix8}, /* E0..E3 */
{_andb ,_ix8}, {_bitb ,_ix8}, {_ldb ,_ix8}, {_stb ,_ix8}, /* E4..E7 */
{_eorb ,_ix8}, {_adcb ,_ix8}, {_orb ,_ix8}, {_addb ,_ix8}, /* E8..EB */
{_ldd ,_ix8}, {_std ,_ix8}, {_ldx ,_ix8}, {_stx ,_ix8}, /* EC..EF */
{_subb ,_ext}, {_cmpb ,_ext}, {_sbcb ,_ext}, {_addd ,_ext}, /* F0..F3 */
{_andb ,_ext}, {_bitb ,_ext}, {_ldb ,_ext}, {_stb ,_ext}, /* F4..F7 */
{_eorb ,_ext}, {_adcb ,_ext}, {_orb ,_ext}, {_addb ,_ext}, /* F8..FB */
{_ldd ,_ext}, {_std ,_ext}, {_ldx ,_ext}, {_stx ,_ext}, /* FC..FF */
};

/*****************************************************************************/
Expand Down Expand Up @@ -172,10 +172,9 @@ adr_t Dasm6301::ParseCode
{
uint8_t instpg, instb, /* T, */ mode;
uint16_t W;
int MI;
const char *I;
int mnemoIndex;
bool bSetLabel;
adr_t PC = FetchInstructionDetails(addr, instpg, instb, mode, MI, I);
adr_t PC = FetchInstructionDetails(addr, instpg, instb, mode, mnemoIndex);

switch (mode) /* which mode is this ? */
{
Expand All @@ -198,7 +197,7 @@ switch (mode) /* which mode is this ? */
{
W = GetUByte(PC);
W = (uint16_t)PhaseInner(W, PC);
AddRelativeLabel(W, PC, mnemo[MI].memType, true, BusCode, addr);
AddRelativeLabel(W, PC, mnemo[mnemoIndex].memType, true, BusCode, addr);
}
PC++;
break;
Expand All @@ -223,12 +222,12 @@ adr_t Dasm6301::DisassembleCode
uint8_t instpg, instb, T, mode;
uint16_t W;
adr_t Wrel;
int MI;
const char *I;
int mnemoIndex;
bool bGetLabel;
Label *lbl;
adr_t PC = FetchInstructionDetails(addr, instpg, instb, mode, MI, I, &smnemo);
adr_t PC = FetchInstructionDetails(addr, instpg, instb, mode, mnemoIndex);

smnemo = mnemo[mnemoIndex].mne;
switch (mode) /* which mode is this? */
{
case _bi : /* Bit Manipulation indexed */
Expand Down
2 changes: 1 addition & 1 deletion Dasm6301.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ class Dasm6301 : public Dasm6801
};


static uint8_t h6301_codes[512];
static CMatrixEntry h6301_codes[256];
static OpCode opcodes[mnemo6301_count - mnemo6801_count];
};

Expand Down
Loading

5 comments on commit 7b897ba

@phillipeaton
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like a functionality step in the right direction!

FWIW, I recently hacked a dasmfw 6502 output file to assemble with Kick Assembler, some basic notes I made:

ZP_Obj_List_Ptr_Lo equ $0000
becomes
.const ZP_Obj_List_Ptr_Lo = $0000

Take out '?' character in names

; becomes //

fcb becomes .byte

fdb becomes .word

labels get a ':' at the end (but not when referenced)

org $2000 becomes * = $2000 "xxx"

@Arakula
Copy link
Owner Author

@Arakula Arakula commented on 7b897ba Oct 10, 2022 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Well, this commit doesn't allow to do all of your changes automatically, but at least some of them.
Things like A equ B --> .const A = B aren't possible, but fcb --> .byte is.
Changing ; to // should be feasible with option cchar //, IIRC (I don't think it's limited to one character).

@Arakula
Copy link
Owner Author

@Arakula Arakula commented on 7b897ba Oct 11, 2022 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

v0.33 (i.e., the next commit I just did) can be used to emit assembler source code for the Kick assembler.
Here's a little info file which works quite nicely here:

option cchar //
option ldchar :
option noaccparm
mnemo org \*=$(parm)
mnemo end //end  * Kick doesn't seem to have that
mnemo equ .const $(label)=$(parm)
mnemo fcb .byte
mnemo fcw .word
mnemo fcc .text
* doesn't seem to work properly - .text "p", for example, results in a $10 byte(?)
* since .text doesn't work as intended, don't use it ...
option nofcc

@phillipeaton
Copy link

@phillipeaton phillipeaton commented on 7b897ba Oct 14, 2022 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You might want to update the documentation text for option cchar to mention that multiple characters will also work. It states (singular) "character" specifically, so I didn't consider trying it with //.

@Arakula
Copy link
Owner Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done.

Please sign in to comment.