summaryrefslogtreecommitdiffstatshomepage
path: root/src/emu/cpu/dsp56k/tables.h
diff options
context:
space:
mode:
author ImJezze <jezze@gmx.net>2015-05-02 19:41:03 +0200
committer ImJezze <jezze@gmx.net>2015-05-02 19:41:03 +0200
commitcc3b682e52bf097d31db78032aad01d6a0b12e94 (patch)
tree860c97ca011b64c31a5ad277f5cea2b1d86eeaf0 /src/emu/cpu/dsp56k/tables.h
parent7df6a23ba2ae1c1df94ed8cc2398f2546f339997 (diff)
parenta649a95488e1fc85813dda747dc74c596496bd1c (diff)
Merge pull request #1 from mamedev/master
Sync to master
Diffstat (limited to 'src/emu/cpu/dsp56k/tables.h')
-rw-r--r--src/emu/cpu/dsp56k/tables.h36
1 files changed, 18 insertions, 18 deletions
diff --git a/src/emu/cpu/dsp56k/tables.h b/src/emu/cpu/dsp56k/tables.h
index 139d89403a0..dbe877f1431 100644
--- a/src/emu/cpu/dsp56k/tables.h
+++ b/src/emu/cpu/dsp56k/tables.h
@@ -46,7 +46,7 @@ void decode_IIIIx_table(const UINT16 IIII, const UINT16 x, reg_id& S, reg_id& D)
void decode_JJJF_table(const UINT16 JJJ, const UINT16 F, reg_id& S, reg_id& D);
void decode_JJF_table(const UINT16 JJ, const UINT16 F, reg_id& S, reg_id& D);
void decode_JF_table(const UINT16 J, const UINT16 F, reg_id& S, reg_id& D);
-void decode_kSign_table(const UINT16 k, astring& plusMinus);
+void decode_kSign_table(const UINT16 k, std::string& plusMinus);
void decode_KKK_table(const UINT16 KKK, reg_id& D1, reg_id& D2);
void decode_NN_table(UINT16 NN, reg_id& ret);
void decode_TT_table(UINT16 TT, reg_id& ret);
@@ -57,20 +57,20 @@ void decode_RR_table(UINT16 RR, reg_id& ret);
void decode_rr_table(UINT16 rr, reg_id& ret);
void decode_s_table(const UINT16 s, op_mnem& arithmetic);
void decode_ss_table(const UINT16 ss, op_mnem& arithmetic);
-void decode_uuuuF_table(const UINT16 uuuu, const UINT16 F, astring& arg, reg_id& S, reg_id& D);
-void decode_Z_table(const UINT16 Z, astring& ea);
-
-void assemble_ea_from_m_table(const UINT16 m, const int n, astring& ea);
-void assemble_eas_from_mm_table(UINT16 mm, int n1, int n2, astring& ea1, astring& ea2);
-void assemble_ea_from_MM_table(UINT16 MM, int n, astring& ea);
-void assemble_ea_from_q_table(UINT16 q, int n, astring& ea);
-void assemble_ea_from_t_table(UINT16 t, UINT16 val, astring& ea);
-void assemble_ea_from_z_table(UINT16 z, int n, astring& ea);
-void assemble_D_from_P_table(UINT16 P, UINT16 ppppp, astring& D);
-void assemble_arguments_from_W_table(UINT16 W, char ma, const reg_id& SD, const astring& ea, astring& S, astring& D);
-void assemble_arguments_from_W_table(UINT16 W, char ma, const astring& SD, const astring& ea, astring& S, astring& D);
-void assemble_reg_from_W_table(UINT16 W, char ma, const reg_id& SD, const INT8 xx, astring& S, astring& D);
-void assemble_address_from_IO_short_address(UINT16 pp, astring& ea);
+void decode_uuuuF_table(const UINT16 uuuu, const UINT16 F, std::string& arg, reg_id& S, reg_id& D);
+void decode_Z_table(const UINT16 Z, std::string& ea);
+
+void assemble_ea_from_m_table(const UINT16 m, const int n, std::string& ea);
+void assemble_eas_from_mm_table(UINT16 mm, int n1, int n2, std::string& ea1, std::string& ea2);
+void assemble_ea_from_MM_table(UINT16 MM, int n, std::string& ea);
+void assemble_ea_from_q_table(UINT16 q, int n, std::string& ea);
+void assemble_ea_from_t_table(UINT16 t, UINT16 val, std::string& ea);
+void assemble_ea_from_z_table(UINT16 z, int n, std::string& ea);
+void assemble_D_from_P_table(UINT16 P, UINT16 ppppp, std::string& D);
+void assemble_arguments_from_W_table(UINT16 W, char ma, const reg_id& SD, const std::string& ea, std::string& S, std::string& D);
+void assemble_arguments_from_W_table(UINT16 W, char ma, const std::string& SD, const std::string& ea, std::string& S, std::string& D);
+void assemble_reg_from_W_table(UINT16 W, char ma, const reg_id& SD, const INT8 xx, std::string& S, std::string& D);
+void assemble_address_from_IO_short_address(UINT16 pp, std::string& ea);
INT8 get_6_bit_signed_value(UINT16 bits);
@@ -82,9 +82,9 @@ bool registerOverlap(const reg_id& r0, const size_t bmd, const reg_id& r1);
UINT16 regValue16(dsp56k_core* cpustate, const reg_id& reg);
void setReg16(dsp56k_core* cpustate, const UINT16& value, const reg_id& reg);
-astring regIdAsString(const reg_id& regId);
-astring opMnemonicAsString(const op_mnem& mnem);
-reg_id stringAsRegID(const astring& str);
+std::string regIdAsString(const reg_id& regId);
+std::string opMnemonicAsString(const op_mnem& mnem);
+reg_id stringAsRegID(const std::string& str);
UINT8 regIDAsNum(const reg_id& regId);