qemu-devel
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Qemu-devel] [PATCH for-3.1 1/2] disas/nanomips: Replace proprietary by


From: Stefan Weil
Subject: [Qemu-devel] [PATCH for-3.1 1/2] disas/nanomips: Replace proprietary by POSIX data types
Date: Tue, 27 Nov 2018 13:17:23 +0100

Signed-off-by: Stefan Weil <address@hidden>
---
 disas/nanomips.cpp | 5250 ++++++++++++++++++++++++++--------------------------
 disas/nanomips.h   | 1631 ++++++++--------
 2 files changed, 3438 insertions(+), 3443 deletions(-)

diff --git a/disas/nanomips.cpp b/disas/nanomips.cpp
index 1238c2ff33..4c3cfceaba 100644
--- a/disas/nanomips.cpp
+++ b/disas/nanomips.cpp
@@ -42,7 +42,7 @@ int nanomips_dis(char *buf,
                  unsigned short three)
 {
     std::string disasm;
-    uint16 bits[3] = {one, two, three};
+    uint16_t bits[3] = {one, two, three};
 
     NMD::TABLE_ENTRY_TYPE type;
     NMD d(address, NMD::ALL_ATTRIBUTES);
@@ -214,7 +214,7 @@ namespace img
     }
 
     std::string format(const char *format,
-                       uint64 d,
+                       uint64_t d,
                        std::string s2)
     {
         char buffer[256];
@@ -226,7 +226,7 @@ namespace img
 
     std::string format(const char *format,
                        std::string s1,
-                       uint64 d,
+                       uint64_t d,
                        std::string s2)
     {
         char buffer[256];
@@ -239,7 +239,7 @@ namespace img
     std::string format(const char *format,
                        std::string s1,
                        std::string s2,
-                       uint64 d)
+                       uint64_t d)
     {
         char buffer[256];
 
@@ -263,20 +263,20 @@ std::string to_string(img::address a)
 }
 
 
-uint64 extract_bits(uint64 data, uint32 bit_offset, uint32 bit_size)
+uint64_t extract_bits(uint64_t data, uint32_t bit_offset, uint32_t bit_size)
 {
     return (data << (64 - (bit_size + bit_offset))) >> (64 - bit_size);
 }
 
 
-int64 sign_extend(int64 data, int msb)
+int64_t sign_extend(int64_t data, int msb)
 {
-    uint64 shift = 63 - msb;
+    uint64_t shift = 63 - msb;
     return (data << shift) >> shift;
 }
 
 
-uint64 NMD::renumber_registers(uint64 index, uint64 *register_list,
+uint64_t NMD::renumber_registers(uint64_t index, uint64_t *register_list,
                                size_t register_list_size)
 {
     if (index < register_list_size) {
@@ -294,131 +294,131 @@ uint64 NMD::renumber_registers(uint64 index, uint64 
*register_list,
  * decode sections so they are based on the encode, the equivalent decode
  * functions need writing eventually.
  */
-uint64 NMD::encode_gpr3(uint64 d)
+uint64_t NMD::encode_gpr3(uint64_t d)
 {
-    static uint64 register_list[] = { 16, 17, 18, 19,  4,  5,  6,  7 };
+    static uint64_t register_list[] = { 16, 17, 18, 19,  4,  5,  6,  7 };
     return renumber_registers(d, register_list,
                sizeof(register_list) / sizeof(register_list[0]));
 }
 
 
-uint64 NMD::encode_gpr3_store(uint64 d)
+uint64_t NMD::encode_gpr3_store(uint64_t d)
 {
-    static uint64 register_list[] = {  0, 17, 18, 19,  4,  5,  6,  7 };
+    static uint64_t register_list[] = {  0, 17, 18, 19,  4,  5,  6,  7 };
     return renumber_registers(d, register_list,
                sizeof(register_list) / sizeof(register_list[0]));
 }
 
 
-uint64 NMD::encode_rd1_from_rd(uint64 d)
+uint64_t NMD::encode_rd1_from_rd(uint64_t d)
 {
-    static uint64 register_list[] = {  4,  5 };
+    static uint64_t register_list[] = {  4,  5 };
     return renumber_registers(d, register_list,
                sizeof(register_list) / sizeof(register_list[0]));
 }
 
 
-uint64 NMD::encode_gpr4_zero(uint64 d)
+uint64_t NMD::encode_gpr4_zero(uint64_t d)
 {
-    static uint64 register_list[] = {  8,  9, 10,  0,  4,  5,  6,  7,
+    static uint64_t register_list[] = {  8,  9, 10,  0,  4,  5,  6,  7,
                                       16, 17, 18, 19, 20, 21, 22, 23 };
     return renumber_registers(d, register_list,
                sizeof(register_list) / sizeof(register_list[0]));
 }
 
 
-uint64 NMD::encode_gpr4(uint64 d)
+uint64_t NMD::encode_gpr4(uint64_t d)
 {
-    static uint64 register_list[] = {  8,  9, 10, 11,  4,  5,  6,  7,
+    static uint64_t register_list[] = {  8,  9, 10, 11,  4,  5,  6,  7,
                                       16, 17, 18, 19, 20, 21, 22, 23 };
     return renumber_registers(d, register_list,
                sizeof(register_list) / sizeof(register_list[0]));
 }
 
 
-uint64 NMD::encode_rd2_reg1(uint64 d)
+uint64_t NMD::encode_rd2_reg1(uint64_t d)
 {
-    static uint64 register_list[] = {  4,  5,  6,  7 };
+    static uint64_t register_list[] = {  4,  5,  6,  7 };
     return renumber_registers(d, register_list,
                sizeof(register_list) / sizeof(register_list[0]));
 }
 
 
-uint64 NMD::encode_rd2_reg2(uint64 d)
+uint64_t NMD::encode_rd2_reg2(uint64_t d)
 {
-    static uint64 register_list[] = {  5,  6,  7,  8 };
+    static uint64_t register_list[] = {  5,  6,  7,  8 };
     return renumber_registers(d, register_list,
                sizeof(register_list) / sizeof(register_list[0]));
 }
 
 
-uint64 NMD::copy(uint64 d)
+uint64_t NMD::copy(uint64_t d)
 {
     return d;
 }
 
 
-int64 NMD::copy(int64 d)
+int64_t NMD::copy(int64_t d)
 {
     return d;
 }
 
 
-int64 NMD::neg_copy(uint64 d)
+int64_t NMD::neg_copy(uint64_t d)
 {
     return 0ll - d;
 }
 
 
-int64 NMD::neg_copy(int64 d)
+int64_t NMD::neg_copy(int64_t d)
 {
     return -d;
 }
 
 
 /* strange wrapper around  gpr3 */
-uint64 NMD::encode_rs3_and_check_rs3_ge_rt3(uint64 d)
+uint64_t NMD::encode_rs3_and_check_rs3_ge_rt3(uint64_t d)
 {
 return encode_gpr3(d);
 }
 
 
 /* strange wrapper around  gpr3 */
-uint64 NMD::encode_rs3_and_check_rs3_lt_rt3(uint64 d)
+uint64_t NMD::encode_rs3_and_check_rs3_lt_rt3(uint64_t d)
 {
     return encode_gpr3(d);
 }
 
 
 /* nop - done by extraction function */
-uint64 NMD::encode_s_from_address(uint64 d)
+uint64_t NMD::encode_s_from_address(uint64_t d)
 {
     return d;
 }
 
 
 /* nop - done by extraction function */
-uint64 NMD::encode_u_from_address(uint64 d)
+uint64_t NMD::encode_u_from_address(uint64_t d)
 {
     return d;
 }
 
 
 /* nop - done by extraction function */
-uint64 NMD::encode_s_from_s_hi(uint64 d)
+uint64_t NMD::encode_s_from_s_hi(uint64_t d)
 {
     return d;
 }
 
 
-uint64 NMD::encode_count3_from_count(uint64 d)
+uint64_t NMD::encode_count3_from_count(uint64_t d)
 {
     IMGASSERTONCE(d < 8);
     return d == 0ull ? 8ull : d;
 }
 
 
-uint64 NMD::encode_shift3_from_shift(uint64 d)
+uint64_t NMD::encode_shift3_from_shift(uint64_t d)
 {
     IMGASSERTONCE(d < 8);
     return d == 0ull ? 8ull : d;
@@ -426,21 +426,21 @@ uint64 NMD::encode_shift3_from_shift(uint64 d)
 
 
 /* special value for load literal */
-int64 NMD::encode_eu_from_s_li16(uint64 d)
+int64_t NMD::encode_eu_from_s_li16(uint64_t d)
 {
     IMGASSERTONCE(d < 128);
-    return d == 127 ? -1 : (int64)d;
+    return d == 127 ? -1 : (int64_t)d;
 }
 
 
-uint64 NMD::encode_msbd_from_size(uint64 d)
+uint64_t NMD::encode_msbd_from_size(uint64_t d)
 {
     IMGASSERTONCE(d < 32);
     return d + 1;
 }
 
 
-uint64 NMD::encode_eu_from_u_andi16(uint64 d)
+uint64_t NMD::encode_eu_from_u_andi16(uint64_t d)
 {
     IMGASSERTONCE(d < 16);
     if (d == 12) {
@@ -453,7 +453,7 @@ uint64 NMD::encode_eu_from_u_andi16(uint64 d)
 }
 
 
-uint64 NMD::encode_msbd_from_pos_and_size(uint64 d)
+uint64_t NMD::encode_msbd_from_pos_and_size(uint64_t d)
 {
     IMGASSERTONCE(0);
     return d;
@@ -461,26 +461,26 @@ uint64 NMD::encode_msbd_from_pos_and_size(uint64 d)
 
 
 /* save16 / restore16   ???? */
-uint64 NMD::encode_rt1_from_rt(uint64 d)
+uint64_t NMD::encode_rt1_from_rt(uint64_t d)
 {
     return d ? 31 : 30;
 }
 
 
 /* ? */
-uint64 NMD::encode_lsb_from_pos_and_size(uint64 d)
+uint64_t NMD::encode_lsb_from_pos_and_size(uint64_t d)
 {
     return d;
 }
 
 
-std::string NMD::save_restore_list(uint64 rt, uint64 count, uint64 gp)
+std::string NMD::save_restore_list(uint64_t rt, uint64_t count, uint64_t gp)
 {
     std::string str;
 
-    for (uint64 counter = 0; counter != count; counter++) {
+    for (uint64_t counter = 0; counter != count; counter++) {
         bool use_gp = gp && (counter == count - 1);
-        uint64 this_rt = use_gp ? 28 : ((rt & 0x10) | (rt + counter)) & 0x1f;
+        uint64_t this_rt = use_gp ? 28 : ((rt & 0x10) | (rt + counter)) & 0x1f;
         str += img::format(",%s", GPR(this_rt));
     }
 
@@ -488,7 +488,7 @@ std::string NMD::save_restore_list(uint64 rt, uint64 count, 
uint64 gp)
 }
 
 
-std::string NMD::GPR(uint64 reg)
+std::string NMD::GPR(uint64_t reg)
 {
     static const char *gpr_reg[32] = {
         "zero", "at",   "v0",   "v1",   "a0",   "a1",   "a2",   "a3",
@@ -505,7 +505,7 @@ std::string NMD::GPR(uint64 reg)
 }
 
 
-std::string NMD::FPR(uint64 reg)
+std::string NMD::FPR(uint64_t reg)
 {
     static const char *fpr_reg[32] = {
         "f0",  "f1",  "f2",  "f3",  "f4",  "f5",  "f6",  "f7",
@@ -522,7 +522,7 @@ std::string NMD::FPR(uint64 reg)
 }
 
 
-std::string NMD::AC(uint64 reg)
+std::string NMD::AC(uint64_t reg)
 {
     static const char *ac_reg[4] = {
         "ac0",  "ac1",  "ac2",  "ac3"
@@ -536,26 +536,26 @@ std::string NMD::AC(uint64 reg)
 }
 
 
-std::string NMD::IMMEDIATE(uint64 value)
+std::string NMD::IMMEDIATE(uint64_t value)
 {
     return img::format("0x%x", value);
 }
 
 
-std::string NMD::IMMEDIATE(int64 value)
+std::string NMD::IMMEDIATE(int64_t value)
 {
     return img::format("%d", value);
 }
 
 
-std::string NMD::CPR(uint64 reg)
+std::string NMD::CPR(uint64_t reg)
 {
     /* needs more work */
     return img::format("CP%d", reg);
 }
 
 
-std::string NMD::ADDRESS(uint64 value, int instruction_size)
+std::string NMD::ADDRESS(uint64_t value, int instruction_size)
 {
     /* token for string replace */
     /* const char TOKEN_REPLACE = (char)0xa2; */
@@ -566,22 +566,22 @@ std::string NMD::ADDRESS(uint64 value, int 
instruction_size)
 }
 
 
-uint64 NMD::extract_op_code_value(const uint16 * data, int size)
+uint64_t NMD::extract_op_code_value(const uint16_t * data, int size)
 {
     switch (size) {
     case 16:
         return data[0];
     case 32:
-        return ((uint64)data[0] << 16) | data[1];
+        return ((uint64_t)data[0] << 16) | data[1];
     case 48:
-        return ((uint64)data[0] << 32) | ((uint64)data[1] << 16) | data[2];
+        return ((uint64_t)data[0] << 32) | ((uint64_t)data[1] << 16) | data[2];
     default:
         return data[0];
     }
 }
 
 
-int NMD::Disassemble(const uint16 * data, std::string & dis,
+int NMD::Disassemble(const uint16_t * data, std::string & dis,
                      NMD::TABLE_ENTRY_TYPE & type)
 {
     return Disassemble(data, dis, type, MAJOR, 2);
@@ -599,14 +599,14 @@ int NMD::Disassemble(const uint16 * data, std::string & 
dis,
  *      instruction size    - negative is error
  *      disassembly string  - on error will constain error string
  */
-int NMD::Disassemble(const uint16 * data, std::string & dis,
+int NMD::Disassemble(const uint16_t * data, std::string & dis,
                      NMD::TABLE_ENTRY_TYPE & type, const Pool *table,
                      int table_size)
 {
     try
     {
         for (int i = 0; i < table_size; i++) {
-            uint64 op_code = extract_op_code_value(data,
+            uint64_t op_code = extract_op_code_value(data,
                                  table[i].instructions_size);
             if ((op_code & table[i].mask) == table[i].value) {
                 /* possible match */
@@ -666,66 +666,66 @@ int NMD::Disassemble(const uint16 * data, std::string & 
dis,
 }
 
 
-uint64 NMD::extract_code_18_to_0(uint64 instruction)
+uint64_t NMD::extract_code_18_to_0(uint64_t instruction)
 {
-    uint64 value = 0;
+    uint64_t value = 0;
     value |= extract_bits(instruction, 0, 19);
     return value;
 }
 
 
-uint64 NMD::extract_shift3_2_1_0(uint64 instruction)
+uint64_t NMD::extract_shift3_2_1_0(uint64_t instruction)
 {
-    uint64 value = 0;
+    uint64_t value = 0;
     value |= extract_bits(instruction, 0, 3);
     return value;
 }
 
 
-uint64 NMD::extr_uil3il3bs9Fmsb11(uint64 instruction)
+uint64_t NMD::extr_uil3il3bs9Fmsb11(uint64_t instruction)
 {
-    uint64 value = 0;
+    uint64_t value = 0;
     value |= extract_bits(instruction, 3, 9) << 3;
     return value;
 }
 
 
-uint64 NMD::extract_count_3_2_1_0(uint64 instruction)
+uint64_t NMD::extract_count_3_2_1_0(uint64_t instruction)
 {
-    uint64 value = 0;
+    uint64_t value = 0;
     value |= extract_bits(instruction, 0, 4);
     return value;
 }
 
 
-uint64 NMD::extract_rtz3_9_8_7(uint64 instruction)
+uint64_t NMD::extract_rtz3_9_8_7(uint64_t instruction)
 {
-    uint64 value = 0;
+    uint64_t value = 0;
     value |= extract_bits(instruction, 7, 3);
     return value;
 }
 
 
-uint64 NMD::extr_uil1il1bs17Fmsb17(uint64 instruction)
+uint64_t NMD::extr_uil1il1bs17Fmsb17(uint64_t instruction)
 {
-    uint64 value = 0;
+    uint64_t value = 0;
     value |= extract_bits(instruction, 1, 17) << 1;
     return value;
 }
 
 
-int64 NMD::extr_sil11il0bs10Tmsb9(uint64 instruction)
+int64_t NMD::extr_sil11il0bs10Tmsb9(uint64_t instruction)
 {
-    int64 value = 0;
+    int64_t value = 0;
     value |= extract_bits(instruction, 11, 10);
     value = sign_extend(value, 9);
     return value;
 }
 
 
-int64 NMD::extr_sil0il11bs1_il1il1bs10Tmsb11(uint64 instruction)
+int64_t NMD::extr_sil0il11bs1_il1il1bs10Tmsb11(uint64_t instruction)
 {
-    int64 value = 0;
+    int64_t value = 0;
     value |= extract_bits(instruction, 0, 1) << 11;
     value |= extract_bits(instruction, 1, 10) << 1;
     value = sign_extend(value, 11);
@@ -733,66 +733,66 @@ int64 NMD::extr_sil0il11bs1_il1il1bs10Tmsb11(uint64 
instruction)
 }
 
 
-uint64 NMD::extract_u_10(uint64 instruction)
+uint64_t NMD::extract_u_10(uint64_t instruction)
 {
-    uint64 value = 0;
+    uint64_t value = 0;
     value |= extract_bits(instruction, 10, 1);
     return value;
 }
 
 
-uint64 NMD::extract_rtz4_27_26_25_23_22_21(uint64 instruction)
+uint64_t NMD::extract_rtz4_27_26_25_23_22_21(uint64_t instruction)
 {
-    uint64 value = 0;
+    uint64_t value = 0;
     value |= extract_bits(instruction, 21, 3);
     value |= extract_bits(instruction, 25, 1) << 3;
     return value;
 }
 
 
-uint64 NMD::extract_sa_15_14_13_12_11(uint64 instruction)
+uint64_t NMD::extract_sa_15_14_13_12_11(uint64_t instruction)
 {
-    uint64 value = 0;
+    uint64_t value = 0;
     value |= extract_bits(instruction, 11, 5);
     return value;
 }
 
 
-uint64 NMD::extract_shift_4_3_2_1_0(uint64 instruction)
+uint64_t NMD::extract_shift_4_3_2_1_0(uint64_t instruction)
 {
-    uint64 value = 0;
+    uint64_t value = 0;
     value |= extract_bits(instruction, 0, 5);
     return value;
 }
 
 
-uint64 NMD::extr_shiftxil7il1bs4Fmsb4(uint64 instruction)
+uint64_t NMD::extr_shiftxil7il1bs4Fmsb4(uint64_t instruction)
 {
-    uint64 value = 0;
+    uint64_t value = 0;
     value |= extract_bits(instruction, 7, 4) << 1;
     return value;
 }
 
 
-uint64 NMD::extract_hint_25_24_23_22_21(uint64 instruction)
+uint64_t NMD::extract_hint_25_24_23_22_21(uint64_t instruction)
 {
-    uint64 value = 0;
+    uint64_t value = 0;
     value |= extract_bits(instruction, 21, 5);
     return value;
 }
 
 
-uint64 NMD::extract_count3_14_13_12(uint64 instruction)
+uint64_t NMD::extract_count3_14_13_12(uint64_t instruction)
 {
-    uint64 value = 0;
+    uint64_t value = 0;
     value |= extract_bits(instruction, 12, 3);
     return value;
 }
 
 
-int64 NMD::extr_sil0il31bs1_il2il21bs10_il12il12bs9Tmsb31(uint64 instruction)
+int64_t NMD::extr_sil0il31bs1_il2il21bs10_il12il12bs9Tmsb31(uint64_t 
instruction)
 {
-    int64 value = 0;
+    int64_t value = 0;
     value |= extract_bits(instruction, 0, 1) << 31;
     value |= extract_bits(instruction, 2, 10) << 21;
     value |= extract_bits(instruction, 12, 9) << 12;
@@ -801,9 +801,9 @@ int64 
NMD::extr_sil0il31bs1_il2il21bs10_il12il12bs9Tmsb31(uint64 instruction)
 }
 
 
-int64 NMD::extr_sil0il7bs1_il1il1bs6Tmsb7(uint64 instruction)
+int64_t NMD::extr_sil0il7bs1_il1il1bs6Tmsb7(uint64_t instruction)
 {
-    int64 value = 0;
+    int64_t value = 0;
     value |= extract_bits(instruction, 0, 1) << 7;
     value |= extract_bits(instruction, 1, 6) << 1;
     value = sign_extend(value, 7);
@@ -811,90 +811,90 @@ int64 NMD::extr_sil0il7bs1_il1il1bs6Tmsb7(uint64 
instruction)
 }
 
 
-uint64 NMD::extract_u2_10_9(uint64 instruction)
+uint64_t NMD::extract_u2_10_9(uint64_t instruction)
 {
-    uint64 value = 0;
+    uint64_t value = 0;
     value |= extract_bits(instruction, 9, 2);
     return value;
 }
 
 
-uint64 NMD::extract_code_25_24_23_22_21_20_19_18_17_16(uint64 instruction)
+uint64_t NMD::extract_code_25_24_23_22_21_20_19_18_17_16(uint64_t instruction)
 {
-    uint64 value = 0;
+    uint64_t value = 0;
     value |= extract_bits(instruction, 16, 10);
     return value;
 }
 
 
-uint64 NMD::extract_rs_20_19_18_17_16(uint64 instruction)
+uint64_t NMD::extract_rs_20_19_18_17_16(uint64_t instruction)
 {
-    uint64 value = 0;
+    uint64_t value = 0;
     value |= extract_bits(instruction, 16, 5);
     return value;
 }
 
 
-uint64 NMD::extr_uil1il1bs2Fmsb2(uint64 instruction)
+uint64_t NMD::extr_uil1il1bs2Fmsb2(uint64_t instruction)
 {
-    uint64 value = 0;
+    uint64_t value = 0;
     value |= extract_bits(instruction, 1, 2) << 1;
     return value;
 }
 
 
-uint64 NMD::extract_stripe_6(uint64 instruction)
+uint64_t NMD::extract_stripe_6(uint64_t instruction)
 {
-    uint64 value = 0;
+    uint64_t value = 0;
     value |= extract_bits(instruction, 6, 1);
     return value;
 }
 
 
-uint64 NMD::extr_xil17il0bs1Fmsb0(uint64 instruction)
+uint64_t NMD::extr_xil17il0bs1Fmsb0(uint64_t instruction)
 {
-    uint64 value = 0;
+    uint64_t value = 0;
     value |= extract_bits(instruction, 17, 1);
     return value;
 }
 
 
-uint64 NMD::extr_xil2il0bs1_il15il0bs1Fmsb0(uint64 instruction)
+uint64_t NMD::extr_xil2il0bs1_il15il0bs1Fmsb0(uint64_t instruction)
 {
-    uint64 value = 0;
+    uint64_t value = 0;
     value |= extract_bits(instruction, 2, 1);
     value |= extract_bits(instruction, 15, 1);
     return value;
 }
 
 
-uint64 NMD::extract_ac_13_12(uint64 instruction)
+uint64_t NMD::extract_ac_13_12(uint64_t instruction)
 {
-    uint64 value = 0;
+    uint64_t value = 0;
     value |= extract_bits(instruction, 14, 2);
     return value;
 }
 
 
-uint64 NMD::extract_shift_20_19_18_17_16(uint64 instruction)
+uint64_t NMD::extract_shift_20_19_18_17_16(uint64_t instruction)
 {
-    uint64 value = 0;
+    uint64_t value = 0;
     value |= extract_bits(instruction, 16, 5);
     return value;
 }
 
 
-uint64 NMD::extract_rdl_25_24(uint64 instruction)
+uint64_t NMD::extract_rdl_25_24(uint64_t instruction)
 {
-    uint64 value = 0;
+    uint64_t value = 0;
     value |= extract_bits(instruction, 24, 1);
     return value;
 }
 
 
-int64 NMD::extr_sil0il10bs1_il1il1bs9Tmsb10(uint64 instruction)
+int64_t NMD::extr_sil0il10bs1_il1il1bs9Tmsb10(uint64_t instruction)
 {
-    int64 value = 0;
+    int64_t value = 0;
     value |= extract_bits(instruction, 0, 1) << 10;
     value |= extract_bits(instruction, 1, 9) << 1;
     value = sign_extend(value, 10);
@@ -902,204 +902,204 @@ int64 NMD::extr_sil0il10bs1_il1il1bs9Tmsb10(uint64 
instruction)
 }
 
 
-uint64 NMD::extract_eu_6_5_4_3_2_1_0(uint64 instruction)
+uint64_t NMD::extract_eu_6_5_4_3_2_1_0(uint64_t instruction)
 {
-    uint64 value = 0;
+    uint64_t value = 0;
     value |= extract_bits(instruction, 0, 7);
     return value;
 }
 
 
-uint64 NMD::extract_shift_5_4_3_2_1_0(uint64 instruction)
+uint64_t NMD::extract_shift_5_4_3_2_1_0(uint64_t instruction)
 {
-    uint64 value = 0;
+    uint64_t value = 0;
     value |= extract_bits(instruction, 0, 6);
     return value;
 }
 
 
-uint64 NMD::extr_xil10il0bs6Fmsb5(uint64 instruction)
+uint64_t NMD::extr_xil10il0bs6Fmsb5(uint64_t instruction)
 {
-    uint64 value = 0;
+    uint64_t value = 0;
     value |= extract_bits(instruction, 10, 6);
     return value;
 }
 
 
-uint64 NMD::extract_count_19_18_17_16(uint64 instruction)
+uint64_t NMD::extract_count_19_18_17_16(uint64_t instruction)
 {
-    uint64 value = 0;
+    uint64_t value = 0;
     value |= extract_bits(instruction, 16, 4);
     return value;
 }
 
 
-uint64 NMD::extract_code_2_1_0(uint64 instruction)
+uint64_t NMD::extract_code_2_1_0(uint64_t instruction)
 {
-    uint64 value = 0;
+    uint64_t value = 0;
     value |= extract_bits(instruction, 0, 3);
     return value;
 }
 
 
-uint64 NMD::extr_xil10il0bs4_il22il0bs4Fmsb3(uint64 instruction)
+uint64_t NMD::extr_xil10il0bs4_il22il0bs4Fmsb3(uint64_t instruction)
 {
-    uint64 value = 0;
+    uint64_t value = 0;
     value |= extract_bits(instruction, 10, 4);
     value |= extract_bits(instruction, 22, 4);
     return value;
 }
 
 
-uint64 NMD::extract_u_11_10_9_8_7_6_5_4_3_2_1_0(uint64 instruction)
+uint64_t NMD::extract_u_11_10_9_8_7_6_5_4_3_2_1_0(uint64_t instruction)
 {
-    uint64 value = 0;
+    uint64_t value = 0;
     value |= extract_bits(instruction, 0, 12);
     return value;
 }
 
 
-uint64 NMD::extract_rs_4_3_2_1_0(uint64 instruction)
+uint64_t NMD::extract_rs_4_3_2_1_0(uint64_t instruction)
 {
-    uint64 value = 0;
+    uint64_t value = 0;
     value |= extract_bits(instruction, 0, 5);
     return value;
 }
 
 
-uint64 NMD::extr_uil3il3bs18Fmsb20(uint64 instruction)
+uint64_t NMD::extr_uil3il3bs18Fmsb20(uint64_t instruction)
 {
-    uint64 value = 0;
+    uint64_t value = 0;
     value |= extract_bits(instruction, 3, 18) << 3;
     return value;
 }
 
 
-uint64 NMD::extr_xil12il0bs1Fmsb0(uint64 instruction)
+uint64_t NMD::extr_xil12il0bs1Fmsb0(uint64_t instruction)
 {
-    uint64 value = 0;
+    uint64_t value = 0;
     value |= extract_bits(instruction, 12, 1);
     return value;
 }
 
 
-uint64 NMD::extr_uil0il2bs4Fmsb5(uint64 instruction)
+uint64_t NMD::extr_uil0il2bs4Fmsb5(uint64_t instruction)
 {
-    uint64 value = 0;
+    uint64_t value = 0;
     value |= extract_bits(instruction, 0, 4) << 2;
     return value;
 }
 
 
-uint64 NMD::extract_cofun_25_24_23(uint64 instruction)
+uint64_t NMD::extract_cofun_25_24_23(uint64_t instruction)
 {
-    uint64 value = 0;
+    uint64_t value = 0;
     value |= extract_bits(instruction, 3, 23);
     return value;
 }
 
 
-uint64 NMD::extr_uil0il2bs3Fmsb4(uint64 instruction)
+uint64_t NMD::extr_uil0il2bs3Fmsb4(uint64_t instruction)
 {
-    uint64 value = 0;
+    uint64_t value = 0;
     value |= extract_bits(instruction, 0, 3) << 2;
     return value;
 }
 
 
-uint64 NMD::extr_xil10il0bs1Fmsb0(uint64 instruction)
+uint64_t NMD::extr_xil10il0bs1Fmsb0(uint64_t instruction)
 {
-    uint64 value = 0;
+    uint64_t value = 0;
     value |= extract_bits(instruction, 10, 1);
     return value;
 }
 
 
-uint64 NMD::extract_rd3_3_2_1(uint64 instruction)
+uint64_t NMD::extract_rd3_3_2_1(uint64_t instruction)
 {
-    uint64 value = 0;
+    uint64_t value = 0;
     value |= extract_bits(instruction, 1, 3);
     return value;
 }
 
 
-uint64 NMD::extract_sa_15_14_13_12(uint64 instruction)
+uint64_t NMD::extract_sa_15_14_13_12(uint64_t instruction)
 {
-    uint64 value = 0;
+    uint64_t value = 0;
     value |= extract_bits(instruction, 12, 4);
     return value;
 }
 
 
-uint64 NMD::extract_rt_25_24_23_22_21(uint64 instruction)
+uint64_t NMD::extract_rt_25_24_23_22_21(uint64_t instruction)
 {
-    uint64 value = 0;
+    uint64_t value = 0;
     value |= extract_bits(instruction, 21, 5);
     return value;
 }
 
 
-uint64 NMD::extract_ru_7_6_5_4_3(uint64 instruction)
+uint64_t NMD::extract_ru_7_6_5_4_3(uint64_t instruction)
 {
-    uint64 value = 0;
+    uint64_t value = 0;
     value |= extract_bits(instruction, 3, 5);
     return value;
 }
 
 
-uint64 NMD::extr_xil21il0bs5Fmsb4(uint64 instruction)
+uint64_t NMD::extr_xil21il0bs5Fmsb4(uint64_t instruction)
 {
-    uint64 value = 0;
+    uint64_t value = 0;
     value |= extract_bits(instruction, 21, 5);
     return value;
 }
 
 
-uint64 NMD::extr_xil9il0bs3Fmsb2(uint64 instruction)
+uint64_t NMD::extr_xil9il0bs3Fmsb2(uint64_t instruction)
 {
-    uint64 value = 0;
+    uint64_t value = 0;
     value |= extract_bits(instruction, 9, 3);
     return value;
 }
 
 
-uint64 NMD::extract_u_17_to_0(uint64 instruction)
+uint64_t NMD::extract_u_17_to_0(uint64_t instruction)
 {
-    uint64 value = 0;
+    uint64_t value = 0;
     value |= extract_bits(instruction, 0, 18);
     return value;
 }
 
 
-uint64 NMD::extr_xil14il0bs1_il15il0bs1Fmsb0(uint64 instruction)
+uint64_t NMD::extr_xil14il0bs1_il15il0bs1Fmsb0(uint64_t instruction)
 {
-    uint64 value = 0;
+    uint64_t value = 0;
     value |= extract_bits(instruction, 14, 1);
     value |= extract_bits(instruction, 15, 1);
     return value;
 }
 
 
-uint64 NMD::extract_rsz4_4_2_1_0(uint64 instruction)
+uint64_t NMD::extract_rsz4_4_2_1_0(uint64_t instruction)
 {
-    uint64 value = 0;
+    uint64_t value = 0;
     value |= extract_bits(instruction, 0, 3);
     value |= extract_bits(instruction, 4, 1) << 3;
     return value;
 }
 
 
-uint64 NMD::extr_xil24il0bs1Fmsb0(uint64 instruction)
+uint64_t NMD::extr_xil24il0bs1Fmsb0(uint64_t instruction)
 {
-    uint64 value = 0;
+    uint64_t value = 0;
     value |= extract_bits(instruction, 24, 1);
     return value;
 }
 
 
-int64 NMD::extr_sil0il21bs1_il1il1bs20Tmsb21(uint64 instruction)
+int64_t NMD::extr_sil0il21bs1_il1il1bs20Tmsb21(uint64_t instruction)
 {
-    int64 value = 0;
+    int64_t value = 0;
     value |= extract_bits(instruction, 0, 1) << 21;
     value |= extract_bits(instruction, 1, 20) << 1;
     value = sign_extend(value, 21);
@@ -1107,101 +1107,101 @@ int64 NMD::extr_sil0il21bs1_il1il1bs20Tmsb21(uint64 
instruction)
 }
 
 
-uint64 NMD::extract_op_25_to_3(uint64 instruction)
+uint64_t NMD::extract_op_25_to_3(uint64_t instruction)
 {
-    uint64 value = 0;
+    uint64_t value = 0;
     value |= extract_bits(instruction, 3, 23);
     return value;
 }
 
 
-uint64 NMD::extract_rs4_4_2_1_0(uint64 instruction)
+uint64_t NMD::extract_rs4_4_2_1_0(uint64_t instruction)
 {
-    uint64 value = 0;
+    uint64_t value = 0;
     value |= extract_bits(instruction, 0, 3);
     value |= extract_bits(instruction, 4, 1) << 3;
     return value;
 }
 
 
-uint64 NMD::extract_bit_23_22_21(uint64 instruction)
+uint64_t NMD::extract_bit_23_22_21(uint64_t instruction)
 {
-    uint64 value = 0;
+    uint64_t value = 0;
     value |= extract_bits(instruction, 21, 3);
     return value;
 }
 
 
-uint64 NMD::extract_rt_41_40_39_38_37(uint64 instruction)
+uint64_t NMD::extract_rt_41_40_39_38_37(uint64_t instruction)
 {
-    uint64 value = 0;
+    uint64_t value = 0;
     value |= extract_bits(instruction, 37, 5);
     return value;
 }
 
 
-int64 NMD::extract_shift_21_20_19_18_17_16(uint64 instruction)
+int64_t NMD::extract_shift_21_20_19_18_17_16(uint64_t instruction)
 {
-    int64 value = 0;
+    int64_t value = 0;
     value |= extract_bits(instruction, 16, 6);
     value = sign_extend(value, 5);
     return value;
 }
 
 
-uint64 NMD::extr_xil6il0bs3_il10il0bs1Fmsb2(uint64 instruction)
+uint64_t NMD::extr_xil6il0bs3_il10il0bs1Fmsb2(uint64_t instruction)
 {
-    uint64 value = 0;
+    uint64_t value = 0;
     value |= extract_bits(instruction, 6, 3);
     value |= extract_bits(instruction, 10, 1);
     return value;
 }
 
 
-uint64 NMD::extract_rd2_3_8(uint64 instruction)
+uint64_t NMD::extract_rd2_3_8(uint64_t instruction)
 {
-    uint64 value = 0;
+    uint64_t value = 0;
     value |= extract_bits(instruction, 3, 1) << 1;
     value |= extract_bits(instruction, 8, 1);
     return value;
 }
 
 
-uint64 NMD::extr_xil16il0bs5Fmsb4(uint64 instruction)
+uint64_t NMD::extr_xil16il0bs5Fmsb4(uint64_t instruction)
 {
-    uint64 value = 0;
+    uint64_t value = 0;
     value |= extract_bits(instruction, 16, 5);
     return value;
 }
 
 
-uint64 NMD::extract_code_17_to_0(uint64 instruction)
+uint64_t NMD::extract_code_17_to_0(uint64_t instruction)
 {
-    uint64 value = 0;
+    uint64_t value = 0;
     value |= extract_bits(instruction, 0, 18);
     return value;
 }
 
 
-uint64 NMD::extr_xil0il0bs12Fmsb11(uint64 instruction)
+uint64_t NMD::extr_xil0il0bs12Fmsb11(uint64_t instruction)
 {
-    uint64 value = 0;
+    uint64_t value = 0;
     value |= extract_bits(instruction, 0, 12);
     return value;
 }
 
 
-uint64 NMD::extract_size_20_19_18_17_16(uint64 instruction)
+uint64_t NMD::extract_size_20_19_18_17_16(uint64_t instruction)
 {
-    uint64 value = 0;
+    uint64_t value = 0;
     value |= extract_bits(instruction, 16, 5);
     return value;
 }
 
 
-int64 NMD::extr_sil2il2bs6_il15il8bs1Tmsb8(uint64 instruction)
+int64_t NMD::extr_sil2il2bs6_il15il8bs1Tmsb8(uint64_t instruction)
 {
-    int64 value = 0;
+    int64_t value = 0;
     value |= extract_bits(instruction, 2, 6) << 2;
     value |= extract_bits(instruction, 15, 1) << 8;
     value = sign_extend(value, 8);
@@ -1209,25 +1209,25 @@ int64 NMD::extr_sil2il2bs6_il15il8bs1Tmsb8(uint64 
instruction)
 }
 
 
-uint64 NMD::extract_u_15_to_0(uint64 instruction)
+uint64_t NMD::extract_u_15_to_0(uint64_t instruction)
 {
-    uint64 value = 0;
+    uint64_t value = 0;
     value |= extract_bits(instruction, 0, 16);
     return value;
 }
 
 
-uint64 NMD::extract_fs_15_14_13_12_11(uint64 instruction)
+uint64_t NMD::extract_fs_15_14_13_12_11(uint64_t instruction)
 {
-    uint64 value = 0;
+    uint64_t value = 0;
     value |= extract_bits(instruction, 16, 5);
     return value;
 }
 
 
-int64 NMD::extr_sil0il0bs8_il15il8bs1Tmsb8(uint64 instruction)
+int64_t NMD::extr_sil0il0bs8_il15il8bs1Tmsb8(uint64_t instruction)
 {
-    int64 value = 0;
+    int64_t value = 0;
     value |= extract_bits(instruction, 0, 8);
     value |= extract_bits(instruction, 15, 1) << 8;
     value = sign_extend(value, 8);
@@ -1235,155 +1235,155 @@ int64 NMD::extr_sil0il0bs8_il15il8bs1Tmsb8(uint64 
instruction)
 }
 
 
-uint64 NMD::extract_stype_20_19_18_17_16(uint64 instruction)
+uint64_t NMD::extract_stype_20_19_18_17_16(uint64_t instruction)
 {
-    uint64 value = 0;
+    uint64_t value = 0;
     value |= extract_bits(instruction, 16, 5);
     return value;
 }
 
 
-uint64 NMD::extract_rtl_11(uint64 instruction)
+uint64_t NMD::extract_rtl_11(uint64_t instruction)
 {
-    uint64 value = 0;
+    uint64_t value = 0;
     value |= extract_bits(instruction, 9, 1);
     return value;
 }
 
 
-uint64 NMD::extract_hs_20_19_18_17_16(uint64 instruction)
+uint64_t NMD::extract_hs_20_19_18_17_16(uint64_t instruction)
 {
-    uint64 value = 0;
+    uint64_t value = 0;
     value |= extract_bits(instruction, 16, 5);
     return value;
 }
 
 
-uint64 NMD::extr_xil10il0bs1_il14il0bs2Fmsb1(uint64 instruction)
+uint64_t NMD::extr_xil10il0bs1_il14il0bs2Fmsb1(uint64_t instruction)
 {
-    uint64 value = 0;
+    uint64_t value = 0;
     value |= extract_bits(instruction, 10, 1);
     value |= extract_bits(instruction, 14, 2);
     return value;
 }
 
 
-uint64 NMD::extract_sel_13_12_11(uint64 instruction)
+uint64_t NMD::extract_sel_13_12_11(uint64_t instruction)
 {
-    uint64 value = 0;
+    uint64_t value = 0;
     value |= extract_bits(instruction, 11, 3);
     return value;
 }
 
 
-uint64 NMD::extract_lsb_4_3_2_1_0(uint64 instruction)
+uint64_t NMD::extract_lsb_4_3_2_1_0(uint64_t instruction)
 {
-    uint64 value = 0;
+    uint64_t value = 0;
     value |= extract_bits(instruction, 0, 5);
     return value;
 }
 
 
-uint64 NMD::extr_xil14il0bs2Fmsb1(uint64 instruction)
+uint64_t NMD::extr_xil14il0bs2Fmsb1(uint64_t instruction)
 {
-    uint64 value = 0;
+    uint64_t value = 0;
     value |= extract_bits(instruction, 14, 2);
     return value;
 }
 
 
-uint64 NMD::extract_gp_2(uint64 instruction)
+uint64_t NMD::extract_gp_2(uint64_t instruction)
 {
-    uint64 value = 0;
+    uint64_t value = 0;
     value |= extract_bits(instruction, 2, 1);
     return value;
 }
 
 
-uint64 NMD::extract_rt3_9_8_7(uint64 instruction)
+uint64_t NMD::extract_rt3_9_8_7(uint64_t instruction)
 {
-    uint64 value = 0;
+    uint64_t value = 0;
     value |= extract_bits(instruction, 7, 3);
     return value;
 }
 
 
-uint64 NMD::extract_ft_20_19_18_17_16(uint64 instruction)
+uint64_t NMD::extract_ft_20_19_18_17_16(uint64_t instruction)
 {
-    uint64 value = 0;
+    uint64_t value = 0;
     value |= extract_bits(instruction, 21, 5);
     return value;
 }
 
 
-uint64 NMD::extract_u_17_16_15_14_13_12_11(uint64 instruction)
+uint64_t NMD::extract_u_17_16_15_14_13_12_11(uint64_t instruction)
 {
-    uint64 value = 0;
+    uint64_t value = 0;
     value |= extract_bits(instruction, 11, 7);
     return value;
 }
 
 
-uint64 NMD::extract_cs_20_19_18_17_16(uint64 instruction)
+uint64_t NMD::extract_cs_20_19_18_17_16(uint64_t instruction)
 {
-    uint64 value = 0;
+    uint64_t value = 0;
     value |= extract_bits(instruction, 16, 5);
     return value;
 }
 
 
-uint64 NMD::extr_xil16il0bs10Fmsb9(uint64 instruction)
+uint64_t NMD::extr_xil16il0bs10Fmsb9(uint64_t instruction)
 {
-    uint64 value = 0;
+    uint64_t value = 0;
     value |= extract_bits(instruction, 16, 10);
     return value;
 }
 
 
-uint64 NMD::extract_rt4_9_7_6_5(uint64 instruction)
+uint64_t NMD::extract_rt4_9_7_6_5(uint64_t instruction)
 {
-    uint64 value = 0;
+    uint64_t value = 0;
     value |= extract_bits(instruction, 5, 3);
     value |= extract_bits(instruction, 9, 1) << 3;
     return value;
 }
 
 
-uint64 NMD::extract_msbt_10_9_8_7_6(uint64 instruction)
+uint64_t NMD::extract_msbt_10_9_8_7_6(uint64_t instruction)
 {
-    uint64 value = 0;
+    uint64_t value = 0;
     value |= extract_bits(instruction, 6, 5);
     return value;
 }
 
 
-uint64 NMD::extr_uil0il2bs6Fmsb7(uint64 instruction)
+uint64_t NMD::extr_uil0il2bs6Fmsb7(uint64_t instruction)
 {
-    uint64 value = 0;
+    uint64_t value = 0;
     value |= extract_bits(instruction, 0, 6) << 2;
     return value;
 }
 
 
-uint64 NMD::extr_xil17il0bs9Fmsb8(uint64 instruction)
+uint64_t NMD::extr_xil17il0bs9Fmsb8(uint64_t instruction)
 {
-    uint64 value = 0;
+    uint64_t value = 0;
     value |= extract_bits(instruction, 17, 9);
     return value;
 }
 
 
-uint64 NMD::extract_sa_15_14_13(uint64 instruction)
+uint64_t NMD::extract_sa_15_14_13(uint64_t instruction)
 {
-    uint64 value = 0;
+    uint64_t value = 0;
     value |= extract_bits(instruction, 13, 3);
     return value;
 }
 
 
-int64 NMD::extr_sil0il14bs1_il1il1bs13Tmsb14(uint64 instruction)
+int64_t NMD::extr_sil0il14bs1_il1il1bs13Tmsb14(uint64_t instruction)
 {
-    int64 value = 0;
+    int64_t value = 0;
     value |= extract_bits(instruction, 0, 1) << 14;
     value |= extract_bits(instruction, 1, 13) << 1;
     value = sign_extend(value, 14);
@@ -1391,114 +1391,114 @@ int64 NMD::extr_sil0il14bs1_il1il1bs13Tmsb14(uint64 
instruction)
 }
 
 
-uint64 NMD::extract_rs3_6_5_4(uint64 instruction)
+uint64_t NMD::extract_rs3_6_5_4(uint64_t instruction)
 {
-    uint64 value = 0;
+    uint64_t value = 0;
     value |= extract_bits(instruction, 4, 3);
     return value;
 }
 
 
-uint64 NMD::extr_uil0il32bs32Fmsb63(uint64 instruction)
+uint64_t NMD::extr_uil0il32bs32Fmsb63(uint64_t instruction)
 {
-    uint64 value = 0;
+    uint64_t value = 0;
     value |= extract_bits(instruction, 0, 32) << 32;
     return value;
 }
 
 
-uint64 NMD::extract_shift_10_9_8_7_6(uint64 instruction)
+uint64_t NMD::extract_shift_10_9_8_7_6(uint64_t instruction)
 {
-    uint64 value = 0;
+    uint64_t value = 0;
     value |= extract_bits(instruction, 6, 5);
     return value;
 }
 
 
-uint64 NMD::extract_cs_25_24_23_22_21(uint64 instruction)
+uint64_t NMD::extract_cs_25_24_23_22_21(uint64_t instruction)
 {
-    uint64 value = 0;
+    uint64_t value = 0;
     value |= extract_bits(instruction, 21, 5);
     return value;
 }
 
 
-uint64 NMD::extract_shiftx_11_10_9_8_7_6(uint64 instruction)
+uint64_t NMD::extract_shiftx_11_10_9_8_7_6(uint64_t instruction)
 {
-    uint64 value = 0;
+    uint64_t value = 0;
     value |= extract_bits(instruction, 6, 6);
     return value;
 }
 
 
-uint64 NMD::extract_rt_9_8_7_6_5(uint64 instruction)
+uint64_t NMD::extract_rt_9_8_7_6_5(uint64_t instruction)
 {
-    uint64 value = 0;
+    uint64_t value = 0;
     value |= extract_bits(instruction, 5, 5);
     return value;
 }
 
 
-uint64 NMD::extract_op_25_24_23_22_21(uint64 instruction)
+uint64_t NMD::extract_op_25_24_23_22_21(uint64_t instruction)
 {
-    uint64 value = 0;
+    uint64_t value = 0;
     value |= extract_bits(instruction, 21, 5);
     return value;
 }
 
 
-uint64 NMD::extr_uil0il2bs7Fmsb8(uint64 instruction)
+uint64_t NMD::extr_uil0il2bs7Fmsb8(uint64_t instruction)
 {
-    uint64 value = 0;
+    uint64_t value = 0;
     value |= extract_bits(instruction, 0, 7) << 2;
     return value;
 }
 
 
-uint64 NMD::extract_bit_16_15_14_13_12_11(uint64 instruction)
+uint64_t NMD::extract_bit_16_15_14_13_12_11(uint64_t instruction)
 {
-    uint64 value = 0;
+    uint64_t value = 0;
     value |= extract_bits(instruction, 11, 6);
     return value;
 }
 
 
-uint64 NMD::extr_xil10il0bs1_il11il0bs5Fmsb4(uint64 instruction)
+uint64_t NMD::extr_xil10il0bs1_il11il0bs5Fmsb4(uint64_t instruction)
 {
-    uint64 value = 0;
+    uint64_t value = 0;
     value |= extract_bits(instruction, 10, 1);
     value |= extract_bits(instruction, 11, 5);
     return value;
 }
 
 
-uint64 NMD::extract_mask_20_19_18_17_16_15_14(uint64 instruction)
+uint64_t NMD::extract_mask_20_19_18_17_16_15_14(uint64_t instruction)
 {
-    uint64 value = 0;
+    uint64_t value = 0;
     value |= extract_bits(instruction, 14, 7);
     return value;
 }
 
 
-uint64 NMD::extract_eu_3_2_1_0(uint64 instruction)
+uint64_t NMD::extract_eu_3_2_1_0(uint64_t instruction)
 {
-    uint64 value = 0;
+    uint64_t value = 0;
     value |= extract_bits(instruction, 0, 4);
     return value;
 }
 
 
-uint64 NMD::extr_uil4il4bs4Fmsb7(uint64 instruction)
+uint64_t NMD::extr_uil4il4bs4Fmsb7(uint64_t instruction)
 {
-    uint64 value = 0;
+    uint64_t value = 0;
     value |= extract_bits(instruction, 4, 4) << 4;
     return value;
 }
 
 
-int64 NMD::extr_sil3il3bs5_il15il8bs1Tmsb8(uint64 instruction)
+int64_t NMD::extr_sil3il3bs5_il15il8bs1Tmsb8(uint64_t instruction)
 {
-    int64 value = 0;
+    int64_t value = 0;
     value |= extract_bits(instruction, 3, 5) << 3;
     value |= extract_bits(instruction, 15, 1) << 8;
     value = sign_extend(value, 8);
@@ -1506,17 +1506,17 @@ int64 NMD::extr_sil3il3bs5_il15il8bs1Tmsb8(uint64 
instruction)
 }
 
 
-uint64 NMD::extract_ft_15_14_13_12_11(uint64 instruction)
+uint64_t NMD::extract_ft_15_14_13_12_11(uint64_t instruction)
 {
-    uint64 value = 0;
+    uint64_t value = 0;
     value |= extract_bits(instruction, 11, 5);
     return value;
 }
 
 
-int64 NMD::extr_sil0il16bs16_il16il0bs16Tmsb31(uint64 instruction)
+int64_t NMD::extr_sil0il16bs16_il16il0bs16Tmsb31(uint64_t instruction)
 {
-    int64 value = 0;
+    int64_t value = 0;
     value |= extract_bits(instruction, 0, 16) << 16;
     value |= extract_bits(instruction, 16, 16);
     value = sign_extend(value, 31);
@@ -1524,65 +1524,65 @@ int64 NMD::extr_sil0il16bs16_il16il0bs16Tmsb31(uint64 
instruction)
 }
 
 
-uint64 NMD::extract_u_20_19_18_17_16_15_14_13(uint64 instruction)
+uint64_t NMD::extract_u_20_19_18_17_16_15_14_13(uint64_t instruction)
 {
-    uint64 value = 0;
+    uint64_t value = 0;
     value |= extract_bits(instruction, 13, 8);
     return value;
 }
 
 
-uint64 NMD::extr_xil15il0bs1Fmsb0(uint64 instruction)
+uint64_t NMD::extr_xil15il0bs1Fmsb0(uint64_t instruction)
 {
-    uint64 value = 0;
+    uint64_t value = 0;
     value |= extract_bits(instruction, 15, 1);
     return value;
 }
 
 
-uint64 NMD::extr_xil11il0bs5Fmsb4(uint64 instruction)
+uint64_t NMD::extr_xil11il0bs5Fmsb4(uint64_t instruction)
 {
-    uint64 value = 0;
+    uint64_t value = 0;
     value |= extract_bits(instruction, 11, 5);
     return value;
 }
 
 
-uint64 NMD::extr_uil2il2bs16Fmsb17(uint64 instruction)
+uint64_t NMD::extr_uil2il2bs16Fmsb17(uint64_t instruction)
 {
-    uint64 value = 0;
+    uint64_t value = 0;
     value |= extract_bits(instruction, 2, 16) << 2;
     return value;
 }
 
 
-uint64 NMD::extract_rd_20_19_18_17_16(uint64 instruction)
+uint64_t NMD::extract_rd_20_19_18_17_16(uint64_t instruction)
 {
-    uint64 value = 0;
+    uint64_t value = 0;
     value |= extract_bits(instruction, 11, 5);
     return value;
 }
 
 
-uint64 NMD::extract_c0s_20_19_18_17_16(uint64 instruction)
+uint64_t NMD::extract_c0s_20_19_18_17_16(uint64_t instruction)
 {
-    uint64 value = 0;
+    uint64_t value = 0;
     value |= extract_bits(instruction, 16, 5);
     return value;
 }
 
 
-uint64 NMD::extract_code_1_0(uint64 instruction)
+uint64_t NMD::extract_code_1_0(uint64_t instruction)
 {
-    uint64 value = 0;
+    uint64_t value = 0;
     value |= extract_bits(instruction, 0, 2);
     return value;
 }
 
 
-int64 NMD::extr_sil0il25bs1_il1il1bs24Tmsb25(uint64 instruction)
+int64_t NMD::extr_sil0il25bs1_il1il1bs24Tmsb25(uint64_t instruction)
 {
-    int64 value = 0;
+    int64_t value = 0;
     value |= extract_bits(instruction, 0, 1) << 25;
     value |= extract_bits(instruction, 1, 24) << 1;
     value = sign_extend(value, 25);
@@ -1590,109 +1590,109 @@ int64 NMD::extr_sil0il25bs1_il1il1bs24Tmsb25(uint64 
instruction)
 }
 
 
-uint64 NMD::extr_xil0il0bs3_il4il0bs1Fmsb2(uint64 instruction)
+uint64_t NMD::extr_xil0il0bs3_il4il0bs1Fmsb2(uint64_t instruction)
 {
-    uint64 value = 0;
+    uint64_t value = 0;
     value |= extract_bits(instruction, 0, 3);
     value |= extract_bits(instruction, 4, 1);
     return value;
 }
 
 
-uint64 NMD::extract_u_1_0(uint64 instruction)
+uint64_t NMD::extract_u_1_0(uint64_t instruction)
 {
-    uint64 value = 0;
+    uint64_t value = 0;
     value |= extract_bits(instruction, 0, 2);
     return value;
 }
 
 
-uint64 NMD::extr_uil3il3bs1_il8il2bs1Fmsb3(uint64 instruction)
+uint64_t NMD::extr_uil3il3bs1_il8il2bs1Fmsb3(uint64_t instruction)
 {
-    uint64 value = 0;
+    uint64_t value = 0;
     value |= extract_bits(instruction, 3, 1) << 3;
     value |= extract_bits(instruction, 8, 1) << 2;
     return value;
 }
 
 
-uint64 NMD::extr_xil9il0bs3_il16il0bs5Fmsb4(uint64 instruction)
+uint64_t NMD::extr_xil9il0bs3_il16il0bs5Fmsb4(uint64_t instruction)
 {
-    uint64 value = 0;
+    uint64_t value = 0;
     value |= extract_bits(instruction, 9, 3);
     value |= extract_bits(instruction, 16, 5);
     return value;
 }
 
 
-uint64 NMD::extract_fd_10_9_8_7_6(uint64 instruction)
+uint64_t NMD::extract_fd_10_9_8_7_6(uint64_t instruction)
 {
-    uint64 value = 0;
+    uint64_t value = 0;
     value |= extract_bits(instruction, 11, 5);
     return value;
 }
 
 
-uint64 NMD::extr_xil6il0bs3Fmsb2(uint64 instruction)
+uint64_t NMD::extr_xil6il0bs3Fmsb2(uint64_t instruction)
 {
-    uint64 value = 0;
+    uint64_t value = 0;
     value |= extract_bits(instruction, 6, 3);
     return value;
 }
 
 
-uint64 NMD::extr_uil0il2bs5Fmsb6(uint64 instruction)
+uint64_t NMD::extr_uil0il2bs5Fmsb6(uint64_t instruction)
 {
-    uint64 value = 0;
+    uint64_t value = 0;
     value |= extract_bits(instruction, 0, 5) << 2;
     return value;
 }
 
 
-uint64 NMD::extract_rtz4_9_7_6_5(uint64 instruction)
+uint64_t NMD::extract_rtz4_9_7_6_5(uint64_t instruction)
 {
-    uint64 value = 0;
+    uint64_t value = 0;
     value |= extract_bits(instruction, 5, 3);
     value |= extract_bits(instruction, 9, 1) << 3;
     return value;
 }
 
 
-uint64 NMD::extract_sel_15_14_13_12_11(uint64 instruction)
+uint64_t NMD::extract_sel_15_14_13_12_11(uint64_t instruction)
 {
-    uint64 value = 0;
+    uint64_t value = 0;
     value |= extract_bits(instruction, 11, 5);
     return value;
 }
 
 
-uint64 NMD::extract_ct_25_24_23_22_21(uint64 instruction)
+uint64_t NMD::extract_ct_25_24_23_22_21(uint64_t instruction)
 {
-    uint64 value = 0;
+    uint64_t value = 0;
     value |= extract_bits(instruction, 21, 5);
     return value;
 }
 
 
-uint64 NMD::extr_xil11il0bs1Fmsb0(uint64 instruction)
+uint64_t NMD::extr_xil11il0bs1Fmsb0(uint64_t instruction)
 {
-    uint64 value = 0;
+    uint64_t value = 0;
     value |= extract_bits(instruction, 11, 1);
     return value;
 }
 
 
-uint64 NMD::extr_uil2il2bs19Fmsb20(uint64 instruction)
+uint64_t NMD::extr_uil2il2bs19Fmsb20(uint64_t instruction)
 {
-    uint64 value = 0;
+    uint64_t value = 0;
     value |= extract_bits(instruction, 2, 19) << 2;
     return value;
 }
 
 
-int64 NMD::extract_s_4_2_1_0(uint64 instruction)
+int64_t NMD::extract_s_4_2_1_0(uint64_t instruction)
 {
-    int64 value = 0;
+    int64_t value = 0;
     value |= extract_bits(instruction, 0, 3);
     value |= extract_bits(instruction, 4, 1) << 3;
     value = sign_extend(value, 3);
@@ -1700,93 +1700,93 @@ int64 NMD::extract_s_4_2_1_0(uint64 instruction)
 }
 
 
-uint64 NMD::extr_uil0il1bs4Fmsb4(uint64 instruction)
+uint64_t NMD::extr_uil0il1bs4Fmsb4(uint64_t instruction)
 {
-    uint64 value = 0;
+    uint64_t value = 0;
     value |= extract_bits(instruction, 0, 4) << 1;
     return value;
 }
 
 
-uint64 NMD::extr_xil9il0bs2Fmsb1(uint64 instruction)
+uint64_t NMD::extr_xil9il0bs2Fmsb1(uint64_t instruction)
 {
-    uint64 value = 0;
+    uint64_t value = 0;
     value |= extract_bits(instruction, 9, 2);
     return value;
 }
 
 
 
-bool NMD::ADDIU_32__cond(uint64 instruction)
+bool NMD::ADDIU_32__cond(uint64_t instruction)
 {
-    uint64 rt = extract_rt_25_24_23_22_21(instruction);
+    uint64_t rt = extract_rt_25_24_23_22_21(instruction);
     return rt != 0;
 }
 
 
-bool NMD::ADDIU_RS5__cond(uint64 instruction)
+bool NMD::ADDIU_RS5__cond(uint64_t instruction)
 {
-    uint64 rt = extract_rt_9_8_7_6_5(instruction);
+    uint64_t rt = extract_rt_9_8_7_6_5(instruction);
     return rt != 0;
 }
 
 
-bool NMD::BALRSC_cond(uint64 instruction)
+bool NMD::BALRSC_cond(uint64_t instruction)
 {
-    uint64 rt = extract_rt_25_24_23_22_21(instruction);
+    uint64_t rt = extract_rt_25_24_23_22_21(instruction);
     return rt != 0;
 }
 
 
-bool NMD::BEQC_16__cond(uint64 instruction)
+bool NMD::BEQC_16__cond(uint64_t instruction)
 {
-    uint64 rs3 = extract_rs3_6_5_4(instruction);
-    uint64 rt3 = extract_rt3_9_8_7(instruction);
-    uint64 u = extr_uil0il1bs4Fmsb4(instruction);
+    uint64_t rs3 = extract_rs3_6_5_4(instruction);
+    uint64_t rt3 = extract_rt3_9_8_7(instruction);
+    uint64_t u = extr_uil0il1bs4Fmsb4(instruction);
     return rs3 < rt3 && u != 0;
 }
 
 
-bool NMD::BNEC_16__cond(uint64 instruction)
+bool NMD::BNEC_16__cond(uint64_t instruction)
 {
-    uint64 rs3 = extract_rs3_6_5_4(instruction);
-    uint64 rt3 = extract_rt3_9_8_7(instruction);
-    uint64 u = extr_uil0il1bs4Fmsb4(instruction);
+    uint64_t rs3 = extract_rs3_6_5_4(instruction);
+    uint64_t rt3 = extract_rt3_9_8_7(instruction);
+    uint64_t u = extr_uil0il1bs4Fmsb4(instruction);
     return rs3 >= rt3 && u != 0;
 }
 
 
-bool NMD::MOVE_cond(uint64 instruction)
+bool NMD::MOVE_cond(uint64_t instruction)
 {
-    uint64 rt = extract_rt_9_8_7_6_5(instruction);
+    uint64_t rt = extract_rt_9_8_7_6_5(instruction);
     return rt != 0;
 }
 
 
-bool NMD::P16_BR1_cond(uint64 instruction)
+bool NMD::P16_BR1_cond(uint64_t instruction)
 {
-    uint64 u = extr_uil0il1bs4Fmsb4(instruction);
+    uint64_t u = extr_uil0il1bs4Fmsb4(instruction);
     return u != 0;
 }
 
 
-bool NMD::PREF_S9__cond(uint64 instruction)
+bool NMD::PREF_S9__cond(uint64_t instruction)
 {
-    uint64 hint = extract_hint_25_24_23_22_21(instruction);
+    uint64_t hint = extract_hint_25_24_23_22_21(instruction);
     return hint != 31;
 }
 
 
-bool NMD::PREFE_cond(uint64 instruction)
+bool NMD::PREFE_cond(uint64_t instruction)
 {
-    uint64 hint = extract_hint_25_24_23_22_21(instruction);
+    uint64_t hint = extract_hint_25_24_23_22_21(instruction);
     return hint != 31;
 }
 
 
-bool NMD::SLTU_cond(uint64 instruction)
+bool NMD::SLTU_cond(uint64_t instruction)
 {
-    uint64 rd = extract_rd_20_19_18_17_16(instruction);
+    uint64_t rd = extract_rd_20_19_18_17_16(instruction);
     return rd != 0;
 }
 
@@ -1802,10 +1802,10 @@ bool NMD::SLTU_cond(uint64 instruction)
  *               fs -----
  *                    fd -----
  */
-std::string NMD::ABS_D(uint64 instruction)
+std::string NMD::ABS_D(uint64_t instruction)
 {
-    uint64 fs_value = extract_fs_15_14_13_12_11(instruction);
-    uint64 fd_value = extract_ft_20_19_18_17_16(instruction);
+    uint64_t fs_value = extract_fs_15_14_13_12_11(instruction);
+    uint64_t fd_value = extract_ft_20_19_18_17_16(instruction);
 
     std::string fs = FPR(copy(fs_value));
     std::string fd = FPR(copy(fd_value));
@@ -1824,10 +1824,10 @@ std::string NMD::ABS_D(uint64 instruction)
  *               fd -----
  *                    fs -----
  */
-std::string NMD::ABS_S(uint64 instruction)
+std::string NMD::ABS_S(uint64_t instruction)
 {
-    uint64 fs_value = extract_fs_15_14_13_12_11(instruction);
-    uint64 fd_value = extract_ft_20_19_18_17_16(instruction);
+    uint64_t fs_value = extract_fs_15_14_13_12_11(instruction);
+    uint64_t fd_value = extract_ft_20_19_18_17_16(instruction);
 
     std::string fs = FPR(copy(fs_value));
     std::string fd = FPR(copy(fd_value));
@@ -1845,10 +1845,10 @@ std::string NMD::ABS_S(uint64 instruction)
  *     rt -----
  *          rs -----
  */
-std::string NMD::ABSQ_S_PH(uint64 instruction)
+std::string NMD::ABSQ_S_PH(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rt = GPR(copy(rt_value));
     std::string rs = GPR(copy(rs_value));
@@ -1866,10 +1866,10 @@ std::string NMD::ABSQ_S_PH(uint64 instruction)
  *     rt -----
  *          rs -----
  */
-std::string NMD::ABSQ_S_QB(uint64 instruction)
+std::string NMD::ABSQ_S_QB(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rt = GPR(copy(rt_value));
     std::string rs = GPR(copy(rs_value));
@@ -1887,10 +1887,10 @@ std::string NMD::ABSQ_S_QB(uint64 instruction)
  *     rt -----
  *          rs -----
  */
-std::string NMD::ABSQ_S_W(uint64 instruction)
+std::string NMD::ABSQ_S_W(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rt = GPR(copy(rt_value));
     std::string rs = GPR(copy(rs_value));
@@ -1908,11 +1908,11 @@ std::string NMD::ABSQ_S_W(uint64 instruction)
  *     rt -----
  *          rs -----
  */
-std::string NMD::ACLR(uint64 instruction)
+std::string NMD::ACLR(uint64_t instruction)
 {
-    uint64 bit_value = extract_bit_23_22_21(instruction);
-    int64 s_value = extr_sil0il0bs8_il15il8bs1Tmsb8(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t bit_value = extract_bit_23_22_21(instruction);
+    int64_t s_value = extr_sil0il0bs8_il15il8bs1Tmsb8(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string bit = IMMEDIATE(copy(bit_value));
     std::string s = IMMEDIATE(copy(s_value));
@@ -1931,11 +1931,11 @@ std::string NMD::ACLR(uint64 instruction)
  *     rt -----
  *          rs -----
  */
-std::string NMD::ADD(uint64 instruction)
+std::string NMD::ADD(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 rd_value = extract_rd_20_19_18_17_16(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t rd_value = extract_rd_20_19_18_17_16(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rd = GPR(copy(rd_value));
     std::string rs = GPR(copy(rs_value));
@@ -1956,11 +1956,11 @@ std::string NMD::ADD(uint64 instruction)
  *               fs -----
  *                    fd -----
  */
-std::string NMD::ADD_D(uint64 instruction)
+std::string NMD::ADD_D(uint64_t instruction)
 {
-    uint64 ft_value = extract_ft_20_19_18_17_16(instruction);
-    uint64 fs_value = extract_fs_15_14_13_12_11(instruction);
-    uint64 fd_value = extract_fd_10_9_8_7_6(instruction);
+    uint64_t ft_value = extract_ft_20_19_18_17_16(instruction);
+    uint64_t fs_value = extract_fs_15_14_13_12_11(instruction);
+    uint64_t fd_value = extract_fd_10_9_8_7_6(instruction);
 
     std::string ft = FPR(copy(ft_value));
     std::string fs = FPR(copy(fs_value));
@@ -1981,11 +1981,11 @@ std::string NMD::ADD_D(uint64 instruction)
  *               fs -----
  *                    fd -----
  */
-std::string NMD::ADD_S(uint64 instruction)
+std::string NMD::ADD_S(uint64_t instruction)
 {
-    uint64 ft_value = extract_ft_20_19_18_17_16(instruction);
-    uint64 fs_value = extract_fs_15_14_13_12_11(instruction);
-    uint64 fd_value = extract_fd_10_9_8_7_6(instruction);
+    uint64_t ft_value = extract_ft_20_19_18_17_16(instruction);
+    uint64_t fs_value = extract_fs_15_14_13_12_11(instruction);
+    uint64_t fd_value = extract_fd_10_9_8_7_6(instruction);
 
     std::string ft = FPR(copy(ft_value));
     std::string fs = FPR(copy(fs_value));
@@ -2004,11 +2004,11 @@ std::string NMD::ADD_S(uint64 instruction)
  *     rt -----
  *          rs -----
  */
-std::string NMD::ADDIU_32_(uint64 instruction)
+std::string NMD::ADDIU_32_(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 u_value = extract_u_15_to_0(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t u_value = extract_u_15_to_0(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rt = GPR(copy(rt_value));
     std::string rs = GPR(copy(rs_value));
@@ -2027,10 +2027,10 @@ std::string NMD::ADDIU_32_(uint64 instruction)
  *     rt -----
  *          rs -----
  */
-std::string NMD::ADDIU_48_(uint64 instruction)
+std::string NMD::ADDIU_48_(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_41_40_39_38_37(instruction);
-    int64 s_value = extr_sil0il16bs16_il16il0bs16Tmsb31(instruction);
+    uint64_t rt_value = extract_rt_41_40_39_38_37(instruction);
+    int64_t s_value = extr_sil0il16bs16_il16il0bs16Tmsb31(instruction);
 
     std::string rt = GPR(copy(rt_value));
     std::string s = IMMEDIATE(copy(s_value));
@@ -2048,10 +2048,10 @@ std::string NMD::ADDIU_48_(uint64 instruction)
  *     rt -----
  *          rs -----
  */
-std::string NMD::ADDIU_GP48_(uint64 instruction)
+std::string NMD::ADDIU_GP48_(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_41_40_39_38_37(instruction);
-    int64 s_value = extr_sil0il16bs16_il16il0bs16Tmsb31(instruction);
+    uint64_t rt_value = extract_rt_41_40_39_38_37(instruction);
+    int64_t s_value = extr_sil0il16bs16_il16il0bs16Tmsb31(instruction);
 
     std::string rt = GPR(copy(rt_value));
     std::string s = IMMEDIATE(copy(s_value));
@@ -2069,10 +2069,10 @@ std::string NMD::ADDIU_GP48_(uint64 instruction)
  *     rt -----
  *          rs -----
  */
-std::string NMD::ADDIU_GP_B_(uint64 instruction)
+std::string NMD::ADDIU_GP_B_(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 u_value = extract_u_17_to_0(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t u_value = extract_u_17_to_0(instruction);
 
     std::string rt = GPR(copy(rt_value));
     std::string u = IMMEDIATE(copy(u_value));
@@ -2090,10 +2090,10 @@ std::string NMD::ADDIU_GP_B_(uint64 instruction)
  *     rt -----
  *          rs -----
  */
-std::string NMD::ADDIU_GP_W_(uint64 instruction)
+std::string NMD::ADDIU_GP_W_(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 u_value = extr_uil2il2bs19Fmsb20(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t u_value = extr_uil2il2bs19Fmsb20(instruction);
 
     std::string rt = GPR(copy(rt_value));
     std::string u = IMMEDIATE(copy(u_value));
@@ -2111,11 +2111,11 @@ std::string NMD::ADDIU_GP_W_(uint64 instruction)
  *     rt -----
  *          rs -----
  */
-std::string NMD::ADDIU_NEG_(uint64 instruction)
+std::string NMD::ADDIU_NEG_(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 u_value = extract_u_11_10_9_8_7_6_5_4_3_2_1_0(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t u_value = extract_u_11_10_9_8_7_6_5_4_3_2_1_0(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rt = GPR(copy(rt_value));
     std::string rs = GPR(copy(rs_value));
@@ -2134,10 +2134,10 @@ std::string NMD::ADDIU_NEG_(uint64 instruction)
  *     rt -----
  *          rs -----
  */
-std::string NMD::ADDIU_R1_SP_(uint64 instruction)
+std::string NMD::ADDIU_R1_SP_(uint64_t instruction)
 {
-    uint64 u_value = extr_uil0il2bs6Fmsb7(instruction);
-    uint64 rt3_value = extract_rt3_9_8_7(instruction);
+    uint64_t u_value = extr_uil0il2bs6Fmsb7(instruction);
+    uint64_t rt3_value = extract_rt3_9_8_7(instruction);
 
     std::string rt3 = GPR(encode_gpr3(rt3_value));
     std::string u = IMMEDIATE(copy(u_value));
@@ -2155,11 +2155,11 @@ std::string NMD::ADDIU_R1_SP_(uint64 instruction)
  *     rt -----
  *          rs -----
  */
-std::string NMD::ADDIU_R2_(uint64 instruction)
+std::string NMD::ADDIU_R2_(uint64_t instruction)
 {
-    uint64 u_value = extr_uil0il2bs3Fmsb4(instruction);
-    uint64 rt3_value = extract_rt3_9_8_7(instruction);
-    uint64 rs3_value = extract_rs3_6_5_4(instruction);
+    uint64_t u_value = extr_uil0il2bs3Fmsb4(instruction);
+    uint64_t rt3_value = extract_rt3_9_8_7(instruction);
+    uint64_t rs3_value = extract_rs3_6_5_4(instruction);
 
     std::string rt3 = GPR(encode_gpr3(rt3_value));
     std::string rs3 = GPR(encode_gpr3(rs3_value));
@@ -2177,10 +2177,10 @@ std::string NMD::ADDIU_R2_(uint64 instruction)
  *     rt -----
  *           s - ---
  */
-std::string NMD::ADDIU_RS5_(uint64 instruction)
+std::string NMD::ADDIU_RS5_(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_9_8_7_6_5(instruction);
-    int64 s_value = extract_s_4_2_1_0(instruction);
+    uint64_t rt_value = extract_rt_9_8_7_6_5(instruction);
+    int64_t s_value = extract_s_4_2_1_0(instruction);
 
     std::string rt = GPR(copy(rt_value));
     std::string s = IMMEDIATE(copy(s_value));
@@ -2199,10 +2199,10 @@ std::string NMD::ADDIU_RS5_(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::ADDIUPC_32_(uint64 instruction)
+std::string NMD::ADDIUPC_32_(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    int64 s_value = extr_sil0il21bs1_il1il1bs20Tmsb21(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    int64_t s_value = extr_sil0il21bs1_il1il1bs20Tmsb21(instruction);
 
     std::string rt = GPR(copy(rt_value));
     std::string s = ADDRESS(encode_s_from_address(s_value), 4);
@@ -2221,10 +2221,10 @@ std::string NMD::ADDIUPC_32_(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::ADDIUPC_48_(uint64 instruction)
+std::string NMD::ADDIUPC_48_(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_41_40_39_38_37(instruction);
-    int64 s_value = extr_sil0il16bs16_il16il0bs16Tmsb31(instruction);
+    uint64_t rt_value = extract_rt_41_40_39_38_37(instruction);
+    int64_t s_value = extr_sil0il16bs16_il16il0bs16Tmsb31(instruction);
 
     std::string rt = GPR(copy(rt_value));
     std::string s = ADDRESS(encode_s_from_address(s_value), 6);
@@ -2243,11 +2243,11 @@ std::string NMD::ADDIUPC_48_(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::ADDQ_PH(uint64 instruction)
+std::string NMD::ADDQ_PH(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 rd_value = extract_rd_20_19_18_17_16(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t rd_value = extract_rd_20_19_18_17_16(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rd = GPR(copy(rd_value));
     std::string rs = GPR(copy(rs_value));
@@ -2267,11 +2267,11 @@ std::string NMD::ADDQ_PH(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::ADDQ_S_PH(uint64 instruction)
+std::string NMD::ADDQ_S_PH(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 rd_value = extract_rd_20_19_18_17_16(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t rd_value = extract_rd_20_19_18_17_16(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rd = GPR(copy(rd_value));
     std::string rs = GPR(copy(rs_value));
@@ -2291,11 +2291,11 @@ std::string NMD::ADDQ_S_PH(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::ADDQ_S_W(uint64 instruction)
+std::string NMD::ADDQ_S_W(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 rd_value = extract_rd_20_19_18_17_16(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t rd_value = extract_rd_20_19_18_17_16(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rd = GPR(copy(rd_value));
     std::string rs = GPR(copy(rs_value));
@@ -2316,11 +2316,11 @@ std::string NMD::ADDQ_S_W(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::ADDQH_PH(uint64 instruction)
+std::string NMD::ADDQH_PH(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 rd_value = extract_rd_20_19_18_17_16(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t rd_value = extract_rd_20_19_18_17_16(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rd = GPR(copy(rd_value));
     std::string rs = GPR(copy(rs_value));
@@ -2341,11 +2341,11 @@ std::string NMD::ADDQH_PH(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::ADDQH_R_PH(uint64 instruction)
+std::string NMD::ADDQH_R_PH(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 rd_value = extract_rd_20_19_18_17_16(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t rd_value = extract_rd_20_19_18_17_16(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rd = GPR(copy(rd_value));
     std::string rs = GPR(copy(rs_value));
@@ -2365,11 +2365,11 @@ std::string NMD::ADDQH_R_PH(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::ADDQH_R_W(uint64 instruction)
+std::string NMD::ADDQH_R_W(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 rd_value = extract_rd_20_19_18_17_16(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t rd_value = extract_rd_20_19_18_17_16(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rd = GPR(copy(rd_value));
     std::string rs = GPR(copy(rs_value));
@@ -2389,11 +2389,11 @@ std::string NMD::ADDQH_R_W(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::ADDQH_W(uint64 instruction)
+std::string NMD::ADDQH_W(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 rd_value = extract_rd_20_19_18_17_16(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t rd_value = extract_rd_20_19_18_17_16(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rd = GPR(copy(rd_value));
     std::string rs = GPR(copy(rs_value));
@@ -2413,11 +2413,11 @@ std::string NMD::ADDQH_W(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::ADDSC(uint64 instruction)
+std::string NMD::ADDSC(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 rd_value = extract_rd_20_19_18_17_16(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t rd_value = extract_rd_20_19_18_17_16(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rd = GPR(copy(rd_value));
     std::string rs = GPR(copy(rs_value));
@@ -2436,11 +2436,11 @@ std::string NMD::ADDSC(uint64 instruction)
  *       rs3 ---
  *          rd3 ---
  */
-std::string NMD::ADDU_16_(uint64 instruction)
+std::string NMD::ADDU_16_(uint64_t instruction)
 {
-    uint64 rt3_value = extract_rt3_9_8_7(instruction);
-    uint64 rs3_value = extract_rs3_6_5_4(instruction);
-    uint64 rd3_value = extract_rd3_3_2_1(instruction);
+    uint64_t rt3_value = extract_rt3_9_8_7(instruction);
+    uint64_t rs3_value = extract_rs3_6_5_4(instruction);
+    uint64_t rd3_value = extract_rd3_3_2_1(instruction);
 
     std::string rt3 = GPR(encode_gpr3(rt3_value));
     std::string rs3 = GPR(encode_gpr3(rs3_value));
@@ -2460,11 +2460,11 @@ std::string NMD::ADDU_16_(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::ADDU_32_(uint64 instruction)
+std::string NMD::ADDU_32_(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 rd_value = extract_rd_20_19_18_17_16(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t rd_value = extract_rd_20_19_18_17_16(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rd = GPR(copy(rd_value));
     std::string rs = GPR(copy(rs_value));
@@ -2484,10 +2484,10 @@ std::string NMD::ADDU_32_(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::ADDU_4X4_(uint64 instruction)
+std::string NMD::ADDU_4X4_(uint64_t instruction)
 {
-    uint64 rs4_value = extract_rs4_4_2_1_0(instruction);
-    uint64 rt4_value = extract_rt4_9_7_6_5(instruction);
+    uint64_t rs4_value = extract_rs4_4_2_1_0(instruction);
+    uint64_t rt4_value = extract_rt4_9_7_6_5(instruction);
 
     std::string rs4 = GPR(encode_gpr4(rs4_value));
     std::string rt4 = GPR(encode_gpr4(rt4_value));
@@ -2506,11 +2506,11 @@ std::string NMD::ADDU_4X4_(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::ADDU_PH(uint64 instruction)
+std::string NMD::ADDU_PH(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 rd_value = extract_rd_20_19_18_17_16(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t rd_value = extract_rd_20_19_18_17_16(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rd = GPR(copy(rd_value));
     std::string rs = GPR(copy(rs_value));
@@ -2530,11 +2530,11 @@ std::string NMD::ADDU_PH(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::ADDU_QB(uint64 instruction)
+std::string NMD::ADDU_QB(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 rd_value = extract_rd_20_19_18_17_16(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t rd_value = extract_rd_20_19_18_17_16(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rd = GPR(copy(rd_value));
     std::string rs = GPR(copy(rs_value));
@@ -2554,11 +2554,11 @@ std::string NMD::ADDU_QB(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::ADDU_S_PH(uint64 instruction)
+std::string NMD::ADDU_S_PH(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 rd_value = extract_rd_20_19_18_17_16(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t rd_value = extract_rd_20_19_18_17_16(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rd = GPR(copy(rd_value));
     std::string rs = GPR(copy(rs_value));
@@ -2578,11 +2578,11 @@ std::string NMD::ADDU_S_PH(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::ADDU_S_QB(uint64 instruction)
+std::string NMD::ADDU_S_QB(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 rd_value = extract_rd_20_19_18_17_16(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t rd_value = extract_rd_20_19_18_17_16(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rd = GPR(copy(rd_value));
     std::string rs = GPR(copy(rs_value));
@@ -2603,11 +2603,11 @@ std::string NMD::ADDU_S_QB(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::ADDUH_QB(uint64 instruction)
+std::string NMD::ADDUH_QB(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 rd_value = extract_rd_20_19_18_17_16(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t rd_value = extract_rd_20_19_18_17_16(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rd = GPR(copy(rd_value));
     std::string rs = GPR(copy(rs_value));
@@ -2628,11 +2628,11 @@ std::string NMD::ADDUH_QB(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::ADDUH_R_QB(uint64 instruction)
+std::string NMD::ADDUH_R_QB(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 rd_value = extract_rd_20_19_18_17_16(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t rd_value = extract_rd_20_19_18_17_16(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rd = GPR(copy(rd_value));
     std::string rs = GPR(copy(rs_value));
@@ -2651,11 +2651,11 @@ std::string NMD::ADDUH_R_QB(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::ADDWC(uint64 instruction)
+std::string NMD::ADDWC(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 rd_value = extract_rd_20_19_18_17_16(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t rd_value = extract_rd_20_19_18_17_16(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rd = GPR(copy(rd_value));
     std::string rs = GPR(copy(rs_value));
@@ -2675,10 +2675,10 @@ std::string NMD::ADDWC(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::ALUIPC(uint64 instruction)
+std::string NMD::ALUIPC(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    int64 s_value = 
extr_sil0il31bs1_il2il21bs10_il12il12bs9Tmsb31(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    int64_t s_value = 
extr_sil0il31bs1_il2il21bs10_il12il12bs9Tmsb31(instruction);
 
     std::string rt = GPR(copy(rt_value));
     std::string s = ADDRESS(encode_s_from_address(s_value), 4);
@@ -2696,10 +2696,10 @@ std::string NMD::ALUIPC(uint64 instruction)
  *       rs3 ---
  *           eu ----
  */
-std::string NMD::AND_16_(uint64 instruction)
+std::string NMD::AND_16_(uint64_t instruction)
 {
-    uint64 rt3_value = extract_rt3_9_8_7(instruction);
-    uint64 rs3_value = extract_rs3_6_5_4(instruction);
+    uint64_t rt3_value = extract_rt3_9_8_7(instruction);
+    uint64_t rs3_value = extract_rs3_6_5_4(instruction);
 
     std::string rt3 = GPR(encode_gpr3(rt3_value));
     std::string rs3 = GPR(encode_gpr3(rs3_value));
@@ -2718,11 +2718,11 @@ std::string NMD::AND_16_(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::AND_32_(uint64 instruction)
+std::string NMD::AND_32_(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 rd_value = extract_rd_20_19_18_17_16(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t rd_value = extract_rd_20_19_18_17_16(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rd = GPR(copy(rd_value));
     std::string rs = GPR(copy(rs_value));
@@ -2741,11 +2741,11 @@ std::string NMD::AND_32_(uint64 instruction)
  *       rs3 ---
  *           eu ----
  */
-std::string NMD::ANDI_16_(uint64 instruction)
+std::string NMD::ANDI_16_(uint64_t instruction)
 {
-    uint64 rt3_value = extract_rt3_9_8_7(instruction);
-    uint64 rs3_value = extract_rs3_6_5_4(instruction);
-    uint64 eu_value = extract_eu_3_2_1_0(instruction);
+    uint64_t rt3_value = extract_rt3_9_8_7(instruction);
+    uint64_t rs3_value = extract_rs3_6_5_4(instruction);
+    uint64_t eu_value = extract_eu_3_2_1_0(instruction);
 
     std::string rt3 = GPR(encode_gpr3(rt3_value));
     std::string rs3 = GPR(encode_gpr3(rs3_value));
@@ -2765,11 +2765,11 @@ std::string NMD::ANDI_16_(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::ANDI_32_(uint64 instruction)
+std::string NMD::ANDI_32_(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 u_value = extract_u_11_10_9_8_7_6_5_4_3_2_1_0(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t u_value = extract_u_11_10_9_8_7_6_5_4_3_2_1_0(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rt = GPR(copy(rt_value));
     std::string rs = GPR(copy(rs_value));
@@ -2789,11 +2789,11 @@ std::string NMD::ANDI_32_(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::APPEND(uint64 instruction)
+std::string NMD::APPEND(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 sa_value = extract_sa_15_14_13_12_11(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t sa_value = extract_sa_15_14_13_12_11(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rt = GPR(copy(rt_value));
     std::string rs = GPR(copy(rs_value));
@@ -2813,11 +2813,11 @@ std::string NMD::APPEND(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::ASET(uint64 instruction)
+std::string NMD::ASET(uint64_t instruction)
 {
-    uint64 bit_value = extract_bit_23_22_21(instruction);
-    int64 s_value = extr_sil0il0bs8_il15il8bs1Tmsb8(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t bit_value = extract_bit_23_22_21(instruction);
+    int64_t s_value = extr_sil0il0bs8_il15il8bs1Tmsb8(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string bit = IMMEDIATE(copy(bit_value));
     std::string s = IMMEDIATE(copy(s_value));
@@ -2837,9 +2837,9 @@ std::string NMD::ASET(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::BALC_16_(uint64 instruction)
+std::string NMD::BALC_16_(uint64_t instruction)
 {
-    int64 s_value = extr_sil0il10bs1_il1il1bs9Tmsb10(instruction);
+    int64_t s_value = extr_sil0il10bs1_il1il1bs9Tmsb10(instruction);
 
     std::string s = ADDRESS(encode_s_from_address(s_value), 2);
 
@@ -2857,9 +2857,9 @@ std::string NMD::BALC_16_(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::BALC_32_(uint64 instruction)
+std::string NMD::BALC_32_(uint64_t instruction)
 {
-    int64 s_value = extr_sil0il25bs1_il1il1bs24Tmsb25(instruction);
+    int64_t s_value = extr_sil0il25bs1_il1il1bs24Tmsb25(instruction);
 
     std::string s = ADDRESS(encode_s_from_address(s_value), 4);
 
@@ -2877,10 +2877,10 @@ std::string NMD::BALC_32_(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::BALRSC(uint64 instruction)
+std::string NMD::BALRSC(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rt = GPR(copy(rt_value));
     std::string rs = GPR(copy(rs_value));
@@ -2899,11 +2899,11 @@ std::string NMD::BALRSC(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::BBEQZC(uint64 instruction)
+std::string NMD::BBEQZC(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 bit_value = extract_bit_16_15_14_13_12_11(instruction);
-    int64 s_value = extr_sil0il11bs1_il1il1bs10Tmsb11(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t bit_value = extract_bit_16_15_14_13_12_11(instruction);
+    int64_t s_value = extr_sil0il11bs1_il1il1bs10Tmsb11(instruction);
 
     std::string rt = GPR(copy(rt_value));
     std::string bit = IMMEDIATE(copy(bit_value));
@@ -2923,11 +2923,11 @@ std::string NMD::BBEQZC(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::BBNEZC(uint64 instruction)
+std::string NMD::BBNEZC(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 bit_value = extract_bit_16_15_14_13_12_11(instruction);
-    int64 s_value = extr_sil0il11bs1_il1il1bs10Tmsb11(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t bit_value = extract_bit_16_15_14_13_12_11(instruction);
+    int64_t s_value = extr_sil0il11bs1_il1il1bs10Tmsb11(instruction);
 
     std::string rt = GPR(copy(rt_value));
     std::string bit = IMMEDIATE(copy(bit_value));
@@ -2947,9 +2947,9 @@ std::string NMD::BBNEZC(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::BC_16_(uint64 instruction)
+std::string NMD::BC_16_(uint64_t instruction)
 {
-    int64 s_value = extr_sil0il10bs1_il1il1bs9Tmsb10(instruction);
+    int64_t s_value = extr_sil0il10bs1_il1il1bs9Tmsb10(instruction);
 
     std::string s = ADDRESS(encode_s_from_address(s_value), 2);
 
@@ -2967,9 +2967,9 @@ std::string NMD::BC_16_(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::BC_32_(uint64 instruction)
+std::string NMD::BC_32_(uint64_t instruction)
 {
-    int64 s_value = extr_sil0il25bs1_il1il1bs24Tmsb25(instruction);
+    int64_t s_value = extr_sil0il25bs1_il1il1bs24Tmsb25(instruction);
 
     std::string s = ADDRESS(encode_s_from_address(s_value), 4);
 
@@ -2987,10 +2987,10 @@ std::string NMD::BC_32_(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::BC1EQZC(uint64 instruction)
+std::string NMD::BC1EQZC(uint64_t instruction)
 {
-    int64 s_value = extr_sil0il14bs1_il1il1bs13Tmsb14(instruction);
-    uint64 ft_value = extract_ft_20_19_18_17_16(instruction);
+    int64_t s_value = extr_sil0il14bs1_il1il1bs13Tmsb14(instruction);
+    uint64_t ft_value = extract_ft_20_19_18_17_16(instruction);
 
     std::string ft = FPR(copy(ft_value));
     std::string s = ADDRESS(encode_s_from_address(s_value), 4);
@@ -3009,10 +3009,10 @@ std::string NMD::BC1EQZC(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::BC1NEZC(uint64 instruction)
+std::string NMD::BC1NEZC(uint64_t instruction)
 {
-    int64 s_value = extr_sil0il14bs1_il1il1bs13Tmsb14(instruction);
-    uint64 ft_value = extract_ft_20_19_18_17_16(instruction);
+    int64_t s_value = extr_sil0il14bs1_il1il1bs13Tmsb14(instruction);
+    uint64_t ft_value = extract_ft_20_19_18_17_16(instruction);
 
     std::string ft = FPR(copy(ft_value));
     std::string s = ADDRESS(encode_s_from_address(s_value), 4);
@@ -3031,10 +3031,10 @@ std::string NMD::BC1NEZC(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::BC2EQZC(uint64 instruction)
+std::string NMD::BC2EQZC(uint64_t instruction)
 {
-    int64 s_value = extr_sil0il14bs1_il1il1bs13Tmsb14(instruction);
-    uint64 ct_value = extract_ct_25_24_23_22_21(instruction);
+    int64_t s_value = extr_sil0il14bs1_il1il1bs13Tmsb14(instruction);
+    uint64_t ct_value = extract_ct_25_24_23_22_21(instruction);
 
     std::string ct = CPR(copy(ct_value));
     std::string s = ADDRESS(encode_s_from_address(s_value), 4);
@@ -3053,10 +3053,10 @@ std::string NMD::BC2EQZC(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::BC2NEZC(uint64 instruction)
+std::string NMD::BC2NEZC(uint64_t instruction)
 {
-    int64 s_value = extr_sil0il14bs1_il1il1bs13Tmsb14(instruction);
-    uint64 ct_value = extract_ct_25_24_23_22_21(instruction);
+    int64_t s_value = extr_sil0il14bs1_il1il1bs13Tmsb14(instruction);
+    uint64_t ct_value = extract_ct_25_24_23_22_21(instruction);
 
     std::string ct = CPR(copy(ct_value));
     std::string s = ADDRESS(encode_s_from_address(s_value), 4);
@@ -3075,11 +3075,11 @@ std::string NMD::BC2NEZC(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::BEQC_16_(uint64 instruction)
+std::string NMD::BEQC_16_(uint64_t instruction)
 {
-    uint64 u_value = extr_uil0il1bs4Fmsb4(instruction);
-    uint64 rt3_value = extract_rt3_9_8_7(instruction);
-    uint64 rs3_value = extract_rs3_6_5_4(instruction);
+    uint64_t u_value = extr_uil0il1bs4Fmsb4(instruction);
+    uint64_t rt3_value = extract_rt3_9_8_7(instruction);
+    uint64_t rs3_value = extract_rs3_6_5_4(instruction);
 
     std::string rs3 = GPR(encode_rs3_and_check_rs3_lt_rt3(rs3_value));
     std::string rt3 = GPR(encode_gpr3(rt3_value));
@@ -3099,11 +3099,11 @@ std::string NMD::BEQC_16_(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::BEQC_32_(uint64 instruction)
+std::string NMD::BEQC_32_(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    int64 s_value = extr_sil0il14bs1_il1il1bs13Tmsb14(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    int64_t s_value = extr_sil0il14bs1_il1il1bs13Tmsb14(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rs = GPR(copy(rs_value));
     std::string rt = GPR(copy(rt_value));
@@ -3123,11 +3123,11 @@ std::string NMD::BEQC_32_(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::BEQIC(uint64 instruction)
+std::string NMD::BEQIC(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    int64 s_value = extr_sil0il11bs1_il1il1bs10Tmsb11(instruction);
-    uint64 u_value = extract_u_17_16_15_14_13_12_11(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    int64_t s_value = extr_sil0il11bs1_il1il1bs10Tmsb11(instruction);
+    uint64_t u_value = extract_u_17_16_15_14_13_12_11(instruction);
 
     std::string rt = GPR(copy(rt_value));
     std::string u = IMMEDIATE(copy(u_value));
@@ -3147,10 +3147,10 @@ std::string NMD::BEQIC(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::BEQZC_16_(uint64 instruction)
+std::string NMD::BEQZC_16_(uint64_t instruction)
 {
-    int64 s_value = extr_sil0il7bs1_il1il1bs6Tmsb7(instruction);
-    uint64 rt3_value = extract_rt3_9_8_7(instruction);
+    int64_t s_value = extr_sil0il7bs1_il1il1bs6Tmsb7(instruction);
+    uint64_t rt3_value = extract_rt3_9_8_7(instruction);
 
     std::string rt3 = GPR(encode_gpr3(rt3_value));
     std::string s = ADDRESS(encode_s_from_address(s_value), 2);
@@ -3169,11 +3169,11 @@ std::string NMD::BEQZC_16_(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::BGEC(uint64 instruction)
+std::string NMD::BGEC(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    int64 s_value = extr_sil0il14bs1_il1il1bs13Tmsb14(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    int64_t s_value = extr_sil0il14bs1_il1il1bs13Tmsb14(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rs = GPR(copy(rs_value));
     std::string rt = GPR(copy(rt_value));
@@ -3193,11 +3193,11 @@ std::string NMD::BGEC(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::BGEIC(uint64 instruction)
+std::string NMD::BGEIC(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    int64 s_value = extr_sil0il11bs1_il1il1bs10Tmsb11(instruction);
-    uint64 u_value = extract_u_17_16_15_14_13_12_11(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    int64_t s_value = extr_sil0il11bs1_il1il1bs10Tmsb11(instruction);
+    uint64_t u_value = extract_u_17_16_15_14_13_12_11(instruction);
 
     std::string rt = GPR(copy(rt_value));
     std::string u = IMMEDIATE(copy(u_value));
@@ -3217,11 +3217,11 @@ std::string NMD::BGEIC(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::BGEIUC(uint64 instruction)
+std::string NMD::BGEIUC(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    int64 s_value = extr_sil0il11bs1_il1il1bs10Tmsb11(instruction);
-    uint64 u_value = extract_u_17_16_15_14_13_12_11(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    int64_t s_value = extr_sil0il11bs1_il1il1bs10Tmsb11(instruction);
+    uint64_t u_value = extract_u_17_16_15_14_13_12_11(instruction);
 
     std::string rt = GPR(copy(rt_value));
     std::string u = IMMEDIATE(copy(u_value));
@@ -3241,11 +3241,11 @@ std::string NMD::BGEIUC(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::BGEUC(uint64 instruction)
+std::string NMD::BGEUC(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    int64 s_value = extr_sil0il14bs1_il1il1bs13Tmsb14(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    int64_t s_value = extr_sil0il14bs1_il1il1bs13Tmsb14(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rs = GPR(copy(rs_value));
     std::string rt = GPR(copy(rt_value));
@@ -3265,11 +3265,11 @@ std::string NMD::BGEUC(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::BLTC(uint64 instruction)
+std::string NMD::BLTC(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    int64 s_value = extr_sil0il14bs1_il1il1bs13Tmsb14(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    int64_t s_value = extr_sil0il14bs1_il1il1bs13Tmsb14(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rs = GPR(copy(rs_value));
     std::string rt = GPR(copy(rt_value));
@@ -3289,11 +3289,11 @@ std::string NMD::BLTC(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::BLTIC(uint64 instruction)
+std::string NMD::BLTIC(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    int64 s_value = extr_sil0il11bs1_il1il1bs10Tmsb11(instruction);
-    uint64 u_value = extract_u_17_16_15_14_13_12_11(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    int64_t s_value = extr_sil0il11bs1_il1il1bs10Tmsb11(instruction);
+    uint64_t u_value = extract_u_17_16_15_14_13_12_11(instruction);
 
     std::string rt = GPR(copy(rt_value));
     std::string u = IMMEDIATE(copy(u_value));
@@ -3313,11 +3313,11 @@ std::string NMD::BLTIC(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::BLTIUC(uint64 instruction)
+std::string NMD::BLTIUC(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    int64 s_value = extr_sil0il11bs1_il1il1bs10Tmsb11(instruction);
-    uint64 u_value = extract_u_17_16_15_14_13_12_11(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    int64_t s_value = extr_sil0il11bs1_il1il1bs10Tmsb11(instruction);
+    uint64_t u_value = extract_u_17_16_15_14_13_12_11(instruction);
 
     std::string rt = GPR(copy(rt_value));
     std::string u = IMMEDIATE(copy(u_value));
@@ -3337,11 +3337,11 @@ std::string NMD::BLTIUC(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::BLTUC(uint64 instruction)
+std::string NMD::BLTUC(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    int64 s_value = extr_sil0il14bs1_il1il1bs13Tmsb14(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    int64_t s_value = extr_sil0il14bs1_il1il1bs13Tmsb14(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rs = GPR(copy(rs_value));
     std::string rt = GPR(copy(rt_value));
@@ -3361,11 +3361,11 @@ std::string NMD::BLTUC(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::BNEC_16_(uint64 instruction)
+std::string NMD::BNEC_16_(uint64_t instruction)
 {
-    uint64 u_value = extr_uil0il1bs4Fmsb4(instruction);
-    uint64 rt3_value = extract_rt3_9_8_7(instruction);
-    uint64 rs3_value = extract_rs3_6_5_4(instruction);
+    uint64_t u_value = extr_uil0il1bs4Fmsb4(instruction);
+    uint64_t rt3_value = extract_rt3_9_8_7(instruction);
+    uint64_t rs3_value = extract_rs3_6_5_4(instruction);
 
     std::string rs3 = GPR(encode_rs3_and_check_rs3_ge_rt3(rs3_value));
     std::string rt3 = GPR(encode_gpr3(rt3_value));
@@ -3385,11 +3385,11 @@ std::string NMD::BNEC_16_(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::BNEC_32_(uint64 instruction)
+std::string NMD::BNEC_32_(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    int64 s_value = extr_sil0il14bs1_il1il1bs13Tmsb14(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    int64_t s_value = extr_sil0il14bs1_il1il1bs13Tmsb14(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rs = GPR(copy(rs_value));
     std::string rt = GPR(copy(rt_value));
@@ -3409,11 +3409,11 @@ std::string NMD::BNEC_32_(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::BNEIC(uint64 instruction)
+std::string NMD::BNEIC(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    int64 s_value = extr_sil0il11bs1_il1il1bs10Tmsb11(instruction);
-    uint64 u_value = extract_u_17_16_15_14_13_12_11(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    int64_t s_value = extr_sil0il11bs1_il1il1bs10Tmsb11(instruction);
+    uint64_t u_value = extract_u_17_16_15_14_13_12_11(instruction);
 
     std::string rt = GPR(copy(rt_value));
     std::string u = IMMEDIATE(copy(u_value));
@@ -3433,10 +3433,10 @@ std::string NMD::BNEIC(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::BNEZC_16_(uint64 instruction)
+std::string NMD::BNEZC_16_(uint64_t instruction)
 {
-    int64 s_value = extr_sil0il7bs1_il1il1bs6Tmsb7(instruction);
-    uint64 rt3_value = extract_rt3_9_8_7(instruction);
+    int64_t s_value = extr_sil0il7bs1_il1il1bs6Tmsb7(instruction);
+    uint64_t rt3_value = extract_rt3_9_8_7(instruction);
 
     std::string rt3 = GPR(encode_gpr3(rt3_value));
     std::string s = ADDRESS(encode_s_from_address(s_value), 2);
@@ -3455,9 +3455,9 @@ std::string NMD::BNEZC_16_(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::BPOSGE32C(uint64 instruction)
+std::string NMD::BPOSGE32C(uint64_t instruction)
 {
-    int64 s_value = extr_sil0il14bs1_il1il1bs13Tmsb14(instruction);
+    int64_t s_value = extr_sil0il14bs1_il1il1bs13Tmsb14(instruction);
 
     std::string s = ADDRESS(encode_s_from_address(s_value), 4);
 
@@ -3475,9 +3475,9 @@ std::string NMD::BPOSGE32C(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::BREAK_16_(uint64 instruction)
+std::string NMD::BREAK_16_(uint64_t instruction)
 {
-    uint64 code_value = extract_code_2_1_0(instruction);
+    uint64_t code_value = extract_code_2_1_0(instruction);
 
     std::string code = IMMEDIATE(copy(code_value));
 
@@ -3495,9 +3495,9 @@ std::string NMD::BREAK_16_(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::BREAK_32_(uint64 instruction)
+std::string NMD::BREAK_32_(uint64_t instruction)
 {
-    uint64 code_value = extract_code_18_to_0(instruction);
+    uint64_t code_value = extract_code_18_to_0(instruction);
 
     std::string code = IMMEDIATE(copy(code_value));
 
@@ -3515,9 +3515,9 @@ std::string NMD::BREAK_32_(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::BRSC(uint64 instruction)
+std::string NMD::BRSC(uint64_t instruction)
 {
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rs = GPR(copy(rs_value));
 
@@ -3535,11 +3535,11 @@ std::string NMD::BRSC(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::CACHE(uint64 instruction)
+std::string NMD::CACHE(uint64_t instruction)
 {
-    int64 s_value = extr_sil0il0bs8_il15il8bs1Tmsb8(instruction);
-    uint64 op_value = extract_op_25_24_23_22_21(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    int64_t s_value = extr_sil0il0bs8_il15il8bs1Tmsb8(instruction);
+    uint64_t op_value = extract_op_25_24_23_22_21(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string op = IMMEDIATE(copy(op_value));
     std::string s = IMMEDIATE(copy(s_value));
@@ -3559,11 +3559,11 @@ std::string NMD::CACHE(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::CACHEE(uint64 instruction)
+std::string NMD::CACHEE(uint64_t instruction)
 {
-    int64 s_value = extr_sil0il0bs8_il15il8bs1Tmsb8(instruction);
-    uint64 op_value = extract_op_25_24_23_22_21(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    int64_t s_value = extr_sil0il0bs8_il15il8bs1Tmsb8(instruction);
+    uint64_t op_value = extract_op_25_24_23_22_21(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string op = IMMEDIATE(copy(op_value));
     std::string s = IMMEDIATE(copy(s_value));
@@ -3583,10 +3583,10 @@ std::string NMD::CACHEE(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::CEIL_L_D(uint64 instruction)
+std::string NMD::CEIL_L_D(uint64_t instruction)
 {
-    uint64 fs_value = extract_fs_15_14_13_12_11(instruction);
-    uint64 ft_value = extract_ft_20_19_18_17_16(instruction);
+    uint64_t fs_value = extract_fs_15_14_13_12_11(instruction);
+    uint64_t ft_value = extract_ft_20_19_18_17_16(instruction);
 
     std::string ft = FPR(copy(ft_value));
     std::string fs = FPR(copy(fs_value));
@@ -3605,10 +3605,10 @@ std::string NMD::CEIL_L_D(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::CEIL_L_S(uint64 instruction)
+std::string NMD::CEIL_L_S(uint64_t instruction)
 {
-    uint64 fs_value = extract_fs_15_14_13_12_11(instruction);
-    uint64 ft_value = extract_ft_20_19_18_17_16(instruction);
+    uint64_t fs_value = extract_fs_15_14_13_12_11(instruction);
+    uint64_t ft_value = extract_ft_20_19_18_17_16(instruction);
 
     std::string ft = FPR(copy(ft_value));
     std::string fs = FPR(copy(fs_value));
@@ -3627,10 +3627,10 @@ std::string NMD::CEIL_L_S(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::CEIL_W_D(uint64 instruction)
+std::string NMD::CEIL_W_D(uint64_t instruction)
 {
-    uint64 fs_value = extract_fs_15_14_13_12_11(instruction);
-    uint64 ft_value = extract_ft_20_19_18_17_16(instruction);
+    uint64_t fs_value = extract_fs_15_14_13_12_11(instruction);
+    uint64_t ft_value = extract_ft_20_19_18_17_16(instruction);
 
     std::string ft = FPR(copy(ft_value));
     std::string fs = FPR(copy(fs_value));
@@ -3649,10 +3649,10 @@ std::string NMD::CEIL_W_D(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::CEIL_W_S(uint64 instruction)
+std::string NMD::CEIL_W_S(uint64_t instruction)
 {
-    uint64 fs_value = extract_fs_15_14_13_12_11(instruction);
-    uint64 ft_value = extract_ft_20_19_18_17_16(instruction);
+    uint64_t fs_value = extract_fs_15_14_13_12_11(instruction);
+    uint64_t ft_value = extract_ft_20_19_18_17_16(instruction);
 
     std::string ft = FPR(copy(ft_value));
     std::string fs = FPR(copy(fs_value));
@@ -3671,10 +3671,10 @@ std::string NMD::CEIL_W_S(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::CFC1(uint64 instruction)
+std::string NMD::CFC1(uint64_t instruction)
 {
-    uint64 cs_value = extract_cs_20_19_18_17_16(instruction);
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t cs_value = extract_cs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
 
     std::string rt = GPR(copy(rt_value));
     std::string cs = CPR(copy(cs_value));
@@ -3693,10 +3693,10 @@ std::string NMD::CFC1(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::CFC2(uint64 instruction)
+std::string NMD::CFC2(uint64_t instruction)
 {
-    uint64 cs_value = extract_cs_20_19_18_17_16(instruction);
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t cs_value = extract_cs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
 
     std::string rt = GPR(copy(rt_value));
     std::string cs = CPR(copy(cs_value));
@@ -3715,10 +3715,10 @@ std::string NMD::CFC2(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::CLASS_D(uint64 instruction)
+std::string NMD::CLASS_D(uint64_t instruction)
 {
-    uint64 fs_value = extract_fs_15_14_13_12_11(instruction);
-    uint64 ft_value = extract_ft_20_19_18_17_16(instruction);
+    uint64_t fs_value = extract_fs_15_14_13_12_11(instruction);
+    uint64_t ft_value = extract_ft_20_19_18_17_16(instruction);
 
     std::string ft = FPR(copy(ft_value));
     std::string fs = FPR(copy(fs_value));
@@ -3737,10 +3737,10 @@ std::string NMD::CLASS_D(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::CLASS_S(uint64 instruction)
+std::string NMD::CLASS_S(uint64_t instruction)
 {
-    uint64 fs_value = extract_fs_15_14_13_12_11(instruction);
-    uint64 ft_value = extract_ft_20_19_18_17_16(instruction);
+    uint64_t fs_value = extract_fs_15_14_13_12_11(instruction);
+    uint64_t ft_value = extract_ft_20_19_18_17_16(instruction);
 
     std::string ft = FPR(copy(ft_value));
     std::string fs = FPR(copy(fs_value));
@@ -3759,10 +3759,10 @@ std::string NMD::CLASS_S(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::CLO(uint64 instruction)
+std::string NMD::CLO(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rt = GPR(copy(rt_value));
     std::string rs = GPR(copy(rs_value));
@@ -3781,10 +3781,10 @@ std::string NMD::CLO(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::CLZ(uint64 instruction)
+std::string NMD::CLZ(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rt = GPR(copy(rt_value));
     std::string rs = GPR(copy(rs_value));
@@ -3803,11 +3803,11 @@ std::string NMD::CLZ(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::CMP_AF_D(uint64 instruction)
+std::string NMD::CMP_AF_D(uint64_t instruction)
 {
-    uint64 fd_value = extract_fd_10_9_8_7_6(instruction);
-    uint64 fs_value = extract_fs_15_14_13_12_11(instruction);
-    uint64 ft_value = extract_ft_20_19_18_17_16(instruction);
+    uint64_t fd_value = extract_fd_10_9_8_7_6(instruction);
+    uint64_t fs_value = extract_fs_15_14_13_12_11(instruction);
+    uint64_t ft_value = extract_ft_20_19_18_17_16(instruction);
 
     std::string fd = FPR(copy(fd_value));
     std::string fs = FPR(copy(fs_value));
@@ -3827,11 +3827,11 @@ std::string NMD::CMP_AF_D(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::CMP_AF_S(uint64 instruction)
+std::string NMD::CMP_AF_S(uint64_t instruction)
 {
-    uint64 fd_value = extract_fd_10_9_8_7_6(instruction);
-    uint64 fs_value = extract_fs_15_14_13_12_11(instruction);
-    uint64 ft_value = extract_ft_20_19_18_17_16(instruction);
+    uint64_t fd_value = extract_fd_10_9_8_7_6(instruction);
+    uint64_t fs_value = extract_fs_15_14_13_12_11(instruction);
+    uint64_t ft_value = extract_ft_20_19_18_17_16(instruction);
 
     std::string fd = FPR(copy(fd_value));
     std::string fs = FPR(copy(fs_value));
@@ -3851,11 +3851,11 @@ std::string NMD::CMP_AF_S(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::CMP_EQ_D(uint64 instruction)
+std::string NMD::CMP_EQ_D(uint64_t instruction)
 {
-    uint64 fd_value = extract_fd_10_9_8_7_6(instruction);
-    uint64 fs_value = extract_fs_15_14_13_12_11(instruction);
-    uint64 ft_value = extract_ft_20_19_18_17_16(instruction);
+    uint64_t fd_value = extract_fd_10_9_8_7_6(instruction);
+    uint64_t fs_value = extract_fs_15_14_13_12_11(instruction);
+    uint64_t ft_value = extract_ft_20_19_18_17_16(instruction);
 
     std::string fd = FPR(copy(fd_value));
     std::string fs = FPR(copy(fs_value));
@@ -3875,10 +3875,10 @@ std::string NMD::CMP_EQ_D(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::CMP_EQ_PH(uint64 instruction)
+std::string NMD::CMP_EQ_PH(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rs = GPR(copy(rs_value));
     std::string rt = GPR(copy(rt_value));
@@ -3897,11 +3897,11 @@ std::string NMD::CMP_EQ_PH(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::CMP_EQ_S(uint64 instruction)
+std::string NMD::CMP_EQ_S(uint64_t instruction)
 {
-    uint64 fd_value = extract_fd_10_9_8_7_6(instruction);
-    uint64 fs_value = extract_fs_15_14_13_12_11(instruction);
-    uint64 ft_value = extract_ft_20_19_18_17_16(instruction);
+    uint64_t fd_value = extract_fd_10_9_8_7_6(instruction);
+    uint64_t fs_value = extract_fs_15_14_13_12_11(instruction);
+    uint64_t ft_value = extract_ft_20_19_18_17_16(instruction);
 
     std::string fd = FPR(copy(fd_value));
     std::string fs = FPR(copy(fs_value));
@@ -3921,11 +3921,11 @@ std::string NMD::CMP_EQ_S(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::CMP_LE_D(uint64 instruction)
+std::string NMD::CMP_LE_D(uint64_t instruction)
 {
-    uint64 fd_value = extract_fd_10_9_8_7_6(instruction);
-    uint64 fs_value = extract_fs_15_14_13_12_11(instruction);
-    uint64 ft_value = extract_ft_20_19_18_17_16(instruction);
+    uint64_t fd_value = extract_fd_10_9_8_7_6(instruction);
+    uint64_t fs_value = extract_fs_15_14_13_12_11(instruction);
+    uint64_t ft_value = extract_ft_20_19_18_17_16(instruction);
 
     std::string fd = FPR(copy(fd_value));
     std::string fs = FPR(copy(fs_value));
@@ -3945,10 +3945,10 @@ std::string NMD::CMP_LE_D(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::CMP_LE_PH(uint64 instruction)
+std::string NMD::CMP_LE_PH(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rs = GPR(copy(rs_value));
     std::string rt = GPR(copy(rt_value));
@@ -3967,11 +3967,11 @@ std::string NMD::CMP_LE_PH(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::CMP_LE_S(uint64 instruction)
+std::string NMD::CMP_LE_S(uint64_t instruction)
 {
-    uint64 fd_value = extract_fd_10_9_8_7_6(instruction);
-    uint64 fs_value = extract_fs_15_14_13_12_11(instruction);
-    uint64 ft_value = extract_ft_20_19_18_17_16(instruction);
+    uint64_t fd_value = extract_fd_10_9_8_7_6(instruction);
+    uint64_t fs_value = extract_fs_15_14_13_12_11(instruction);
+    uint64_t ft_value = extract_ft_20_19_18_17_16(instruction);
 
     std::string fd = FPR(copy(fd_value));
     std::string fs = FPR(copy(fs_value));
@@ -3991,11 +3991,11 @@ std::string NMD::CMP_LE_S(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::CMP_LT_D(uint64 instruction)
+std::string NMD::CMP_LT_D(uint64_t instruction)
 {
-    uint64 fd_value = extract_fd_10_9_8_7_6(instruction);
-    uint64 fs_value = extract_fs_15_14_13_12_11(instruction);
-    uint64 ft_value = extract_ft_20_19_18_17_16(instruction);
+    uint64_t fd_value = extract_fd_10_9_8_7_6(instruction);
+    uint64_t fs_value = extract_fs_15_14_13_12_11(instruction);
+    uint64_t ft_value = extract_ft_20_19_18_17_16(instruction);
 
     std::string fd = FPR(copy(fd_value));
     std::string fs = FPR(copy(fs_value));
@@ -4015,10 +4015,10 @@ std::string NMD::CMP_LT_D(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::CMP_LT_PH(uint64 instruction)
+std::string NMD::CMP_LT_PH(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rs = GPR(copy(rs_value));
     std::string rt = GPR(copy(rt_value));
@@ -4037,11 +4037,11 @@ std::string NMD::CMP_LT_PH(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::CMP_LT_S(uint64 instruction)
+std::string NMD::CMP_LT_S(uint64_t instruction)
 {
-    uint64 fd_value = extract_fd_10_9_8_7_6(instruction);
-    uint64 fs_value = extract_fs_15_14_13_12_11(instruction);
-    uint64 ft_value = extract_ft_20_19_18_17_16(instruction);
+    uint64_t fd_value = extract_fd_10_9_8_7_6(instruction);
+    uint64_t fs_value = extract_fs_15_14_13_12_11(instruction);
+    uint64_t ft_value = extract_ft_20_19_18_17_16(instruction);
 
     std::string fd = FPR(copy(fd_value));
     std::string fs = FPR(copy(fs_value));
@@ -4061,11 +4061,11 @@ std::string NMD::CMP_LT_S(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::CMP_NE_D(uint64 instruction)
+std::string NMD::CMP_NE_D(uint64_t instruction)
 {
-    uint64 fd_value = extract_fd_10_9_8_7_6(instruction);
-    uint64 fs_value = extract_fs_15_14_13_12_11(instruction);
-    uint64 ft_value = extract_ft_20_19_18_17_16(instruction);
+    uint64_t fd_value = extract_fd_10_9_8_7_6(instruction);
+    uint64_t fs_value = extract_fs_15_14_13_12_11(instruction);
+    uint64_t ft_value = extract_ft_20_19_18_17_16(instruction);
 
     std::string fd = FPR(copy(fd_value));
     std::string fs = FPR(copy(fs_value));
@@ -4085,11 +4085,11 @@ std::string NMD::CMP_NE_D(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::CMP_NE_S(uint64 instruction)
+std::string NMD::CMP_NE_S(uint64_t instruction)
 {
-    uint64 fd_value = extract_fd_10_9_8_7_6(instruction);
-    uint64 fs_value = extract_fs_15_14_13_12_11(instruction);
-    uint64 ft_value = extract_ft_20_19_18_17_16(instruction);
+    uint64_t fd_value = extract_fd_10_9_8_7_6(instruction);
+    uint64_t fs_value = extract_fs_15_14_13_12_11(instruction);
+    uint64_t ft_value = extract_ft_20_19_18_17_16(instruction);
 
     std::string fd = FPR(copy(fd_value));
     std::string fs = FPR(copy(fs_value));
@@ -4109,11 +4109,11 @@ std::string NMD::CMP_NE_S(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::CMP_OR_D(uint64 instruction)
+std::string NMD::CMP_OR_D(uint64_t instruction)
 {
-    uint64 fd_value = extract_fd_10_9_8_7_6(instruction);
-    uint64 fs_value = extract_fs_15_14_13_12_11(instruction);
-    uint64 ft_value = extract_ft_20_19_18_17_16(instruction);
+    uint64_t fd_value = extract_fd_10_9_8_7_6(instruction);
+    uint64_t fs_value = extract_fs_15_14_13_12_11(instruction);
+    uint64_t ft_value = extract_ft_20_19_18_17_16(instruction);
 
     std::string fd = FPR(copy(fd_value));
     std::string fs = FPR(copy(fs_value));
@@ -4133,11 +4133,11 @@ std::string NMD::CMP_OR_D(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::CMP_OR_S(uint64 instruction)
+std::string NMD::CMP_OR_S(uint64_t instruction)
 {
-    uint64 fd_value = extract_fd_10_9_8_7_6(instruction);
-    uint64 fs_value = extract_fs_15_14_13_12_11(instruction);
-    uint64 ft_value = extract_ft_20_19_18_17_16(instruction);
+    uint64_t fd_value = extract_fd_10_9_8_7_6(instruction);
+    uint64_t fs_value = extract_fs_15_14_13_12_11(instruction);
+    uint64_t ft_value = extract_ft_20_19_18_17_16(instruction);
 
     std::string fd = FPR(copy(fd_value));
     std::string fs = FPR(copy(fs_value));
@@ -4157,11 +4157,11 @@ std::string NMD::CMP_OR_S(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::CMP_SAF_D(uint64 instruction)
+std::string NMD::CMP_SAF_D(uint64_t instruction)
 {
-    uint64 fd_value = extract_fd_10_9_8_7_6(instruction);
-    uint64 fs_value = extract_fs_15_14_13_12_11(instruction);
-    uint64 ft_value = extract_ft_20_19_18_17_16(instruction);
+    uint64_t fd_value = extract_fd_10_9_8_7_6(instruction);
+    uint64_t fs_value = extract_fs_15_14_13_12_11(instruction);
+    uint64_t ft_value = extract_ft_20_19_18_17_16(instruction);
 
     std::string fd = FPR(copy(fd_value));
     std::string fs = FPR(copy(fs_value));
@@ -4181,11 +4181,11 @@ std::string NMD::CMP_SAF_D(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::CMP_SAF_S(uint64 instruction)
+std::string NMD::CMP_SAF_S(uint64_t instruction)
 {
-    uint64 fd_value = extract_fd_10_9_8_7_6(instruction);
-    uint64 fs_value = extract_fs_15_14_13_12_11(instruction);
-    uint64 ft_value = extract_ft_20_19_18_17_16(instruction);
+    uint64_t fd_value = extract_fd_10_9_8_7_6(instruction);
+    uint64_t fs_value = extract_fs_15_14_13_12_11(instruction);
+    uint64_t ft_value = extract_ft_20_19_18_17_16(instruction);
 
     std::string fd = FPR(copy(fd_value));
     std::string fs = FPR(copy(fs_value));
@@ -4205,11 +4205,11 @@ std::string NMD::CMP_SAF_S(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::CMP_SEQ_D(uint64 instruction)
+std::string NMD::CMP_SEQ_D(uint64_t instruction)
 {
-    uint64 fd_value = extract_fd_10_9_8_7_6(instruction);
-    uint64 fs_value = extract_fs_15_14_13_12_11(instruction);
-    uint64 ft_value = extract_ft_20_19_18_17_16(instruction);
+    uint64_t fd_value = extract_fd_10_9_8_7_6(instruction);
+    uint64_t fs_value = extract_fs_15_14_13_12_11(instruction);
+    uint64_t ft_value = extract_ft_20_19_18_17_16(instruction);
 
     std::string fd = FPR(copy(fd_value));
     std::string fs = FPR(copy(fs_value));
@@ -4229,11 +4229,11 @@ std::string NMD::CMP_SEQ_D(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::CMP_SEQ_S(uint64 instruction)
+std::string NMD::CMP_SEQ_S(uint64_t instruction)
 {
-    uint64 fd_value = extract_fd_10_9_8_7_6(instruction);
-    uint64 fs_value = extract_fs_15_14_13_12_11(instruction);
-    uint64 ft_value = extract_ft_20_19_18_17_16(instruction);
+    uint64_t fd_value = extract_fd_10_9_8_7_6(instruction);
+    uint64_t fs_value = extract_fs_15_14_13_12_11(instruction);
+    uint64_t ft_value = extract_ft_20_19_18_17_16(instruction);
 
     std::string fd = FPR(copy(fd_value));
     std::string fs = FPR(copy(fs_value));
@@ -4253,11 +4253,11 @@ std::string NMD::CMP_SEQ_S(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::CMP_SLE_D(uint64 instruction)
+std::string NMD::CMP_SLE_D(uint64_t instruction)
 {
-    uint64 fd_value = extract_fd_10_9_8_7_6(instruction);
-    uint64 fs_value = extract_fs_15_14_13_12_11(instruction);
-    uint64 ft_value = extract_ft_20_19_18_17_16(instruction);
+    uint64_t fd_value = extract_fd_10_9_8_7_6(instruction);
+    uint64_t fs_value = extract_fs_15_14_13_12_11(instruction);
+    uint64_t ft_value = extract_ft_20_19_18_17_16(instruction);
 
     std::string fd = FPR(copy(fd_value));
     std::string fs = FPR(copy(fs_value));
@@ -4277,11 +4277,11 @@ std::string NMD::CMP_SLE_D(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::CMP_SLE_S(uint64 instruction)
+std::string NMD::CMP_SLE_S(uint64_t instruction)
 {
-    uint64 fd_value = extract_fd_10_9_8_7_6(instruction);
-    uint64 fs_value = extract_fs_15_14_13_12_11(instruction);
-    uint64 ft_value = extract_ft_20_19_18_17_16(instruction);
+    uint64_t fd_value = extract_fd_10_9_8_7_6(instruction);
+    uint64_t fs_value = extract_fs_15_14_13_12_11(instruction);
+    uint64_t ft_value = extract_ft_20_19_18_17_16(instruction);
 
     std::string fd = FPR(copy(fd_value));
     std::string fs = FPR(copy(fs_value));
@@ -4301,11 +4301,11 @@ std::string NMD::CMP_SLE_S(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::CMP_SLT_D(uint64 instruction)
+std::string NMD::CMP_SLT_D(uint64_t instruction)
 {
-    uint64 fd_value = extract_fd_10_9_8_7_6(instruction);
-    uint64 fs_value = extract_fs_15_14_13_12_11(instruction);
-    uint64 ft_value = extract_ft_20_19_18_17_16(instruction);
+    uint64_t fd_value = extract_fd_10_9_8_7_6(instruction);
+    uint64_t fs_value = extract_fs_15_14_13_12_11(instruction);
+    uint64_t ft_value = extract_ft_20_19_18_17_16(instruction);
 
     std::string fd = FPR(copy(fd_value));
     std::string fs = FPR(copy(fs_value));
@@ -4325,11 +4325,11 @@ std::string NMD::CMP_SLT_D(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::CMP_SLT_S(uint64 instruction)
+std::string NMD::CMP_SLT_S(uint64_t instruction)
 {
-    uint64 fd_value = extract_fd_10_9_8_7_6(instruction);
-    uint64 fs_value = extract_fs_15_14_13_12_11(instruction);
-    uint64 ft_value = extract_ft_20_19_18_17_16(instruction);
+    uint64_t fd_value = extract_fd_10_9_8_7_6(instruction);
+    uint64_t fs_value = extract_fs_15_14_13_12_11(instruction);
+    uint64_t ft_value = extract_ft_20_19_18_17_16(instruction);
 
     std::string fd = FPR(copy(fd_value));
     std::string fs = FPR(copy(fs_value));
@@ -4349,11 +4349,11 @@ std::string NMD::CMP_SLT_S(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::CMP_SNE_D(uint64 instruction)
+std::string NMD::CMP_SNE_D(uint64_t instruction)
 {
-    uint64 fd_value = extract_fd_10_9_8_7_6(instruction);
-    uint64 fs_value = extract_fs_15_14_13_12_11(instruction);
-    uint64 ft_value = extract_ft_20_19_18_17_16(instruction);
+    uint64_t fd_value = extract_fd_10_9_8_7_6(instruction);
+    uint64_t fs_value = extract_fs_15_14_13_12_11(instruction);
+    uint64_t ft_value = extract_ft_20_19_18_17_16(instruction);
 
     std::string fd = FPR(copy(fd_value));
     std::string fs = FPR(copy(fs_value));
@@ -4373,11 +4373,11 @@ std::string NMD::CMP_SNE_D(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::CMP_SNE_S(uint64 instruction)
+std::string NMD::CMP_SNE_S(uint64_t instruction)
 {
-    uint64 fd_value = extract_fd_10_9_8_7_6(instruction);
-    uint64 fs_value = extract_fs_15_14_13_12_11(instruction);
-    uint64 ft_value = extract_ft_20_19_18_17_16(instruction);
+    uint64_t fd_value = extract_fd_10_9_8_7_6(instruction);
+    uint64_t fs_value = extract_fs_15_14_13_12_11(instruction);
+    uint64_t ft_value = extract_ft_20_19_18_17_16(instruction);
 
     std::string fd = FPR(copy(fd_value));
     std::string fs = FPR(copy(fs_value));
@@ -4397,11 +4397,11 @@ std::string NMD::CMP_SNE_S(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::CMP_SOR_D(uint64 instruction)
+std::string NMD::CMP_SOR_D(uint64_t instruction)
 {
-    uint64 fd_value = extract_fd_10_9_8_7_6(instruction);
-    uint64 fs_value = extract_fs_15_14_13_12_11(instruction);
-    uint64 ft_value = extract_ft_20_19_18_17_16(instruction);
+    uint64_t fd_value = extract_fd_10_9_8_7_6(instruction);
+    uint64_t fs_value = extract_fs_15_14_13_12_11(instruction);
+    uint64_t ft_value = extract_ft_20_19_18_17_16(instruction);
 
     std::string fd = FPR(copy(fd_value));
     std::string fs = FPR(copy(fs_value));
@@ -4421,11 +4421,11 @@ std::string NMD::CMP_SOR_D(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::CMP_SOR_S(uint64 instruction)
+std::string NMD::CMP_SOR_S(uint64_t instruction)
 {
-    uint64 fd_value = extract_fd_10_9_8_7_6(instruction);
-    uint64 fs_value = extract_fs_15_14_13_12_11(instruction);
-    uint64 ft_value = extract_ft_20_19_18_17_16(instruction);
+    uint64_t fd_value = extract_fd_10_9_8_7_6(instruction);
+    uint64_t fs_value = extract_fs_15_14_13_12_11(instruction);
+    uint64_t ft_value = extract_ft_20_19_18_17_16(instruction);
 
     std::string fd = FPR(copy(fd_value));
     std::string fs = FPR(copy(fs_value));
@@ -4445,11 +4445,11 @@ std::string NMD::CMP_SOR_S(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::CMP_SUEQ_D(uint64 instruction)
+std::string NMD::CMP_SUEQ_D(uint64_t instruction)
 {
-    uint64 fd_value = extract_fd_10_9_8_7_6(instruction);
-    uint64 fs_value = extract_fs_15_14_13_12_11(instruction);
-    uint64 ft_value = extract_ft_20_19_18_17_16(instruction);
+    uint64_t fd_value = extract_fd_10_9_8_7_6(instruction);
+    uint64_t fs_value = extract_fs_15_14_13_12_11(instruction);
+    uint64_t ft_value = extract_ft_20_19_18_17_16(instruction);
 
     std::string fd = FPR(copy(fd_value));
     std::string fs = FPR(copy(fs_value));
@@ -4469,11 +4469,11 @@ std::string NMD::CMP_SUEQ_D(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::CMP_SUEQ_S(uint64 instruction)
+std::string NMD::CMP_SUEQ_S(uint64_t instruction)
 {
-    uint64 fd_value = extract_fd_10_9_8_7_6(instruction);
-    uint64 fs_value = extract_fs_15_14_13_12_11(instruction);
-    uint64 ft_value = extract_ft_20_19_18_17_16(instruction);
+    uint64_t fd_value = extract_fd_10_9_8_7_6(instruction);
+    uint64_t fs_value = extract_fs_15_14_13_12_11(instruction);
+    uint64_t ft_value = extract_ft_20_19_18_17_16(instruction);
 
     std::string fd = FPR(copy(fd_value));
     std::string fs = FPR(copy(fs_value));
@@ -4493,11 +4493,11 @@ std::string NMD::CMP_SUEQ_S(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::CMP_SULE_D(uint64 instruction)
+std::string NMD::CMP_SULE_D(uint64_t instruction)
 {
-    uint64 fd_value = extract_fd_10_9_8_7_6(instruction);
-    uint64 fs_value = extract_fs_15_14_13_12_11(instruction);
-    uint64 ft_value = extract_ft_20_19_18_17_16(instruction);
+    uint64_t fd_value = extract_fd_10_9_8_7_6(instruction);
+    uint64_t fs_value = extract_fs_15_14_13_12_11(instruction);
+    uint64_t ft_value = extract_ft_20_19_18_17_16(instruction);
 
     std::string fd = FPR(copy(fd_value));
     std::string fs = FPR(copy(fs_value));
@@ -4517,11 +4517,11 @@ std::string NMD::CMP_SULE_D(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::CMP_SULE_S(uint64 instruction)
+std::string NMD::CMP_SULE_S(uint64_t instruction)
 {
-    uint64 fd_value = extract_fd_10_9_8_7_6(instruction);
-    uint64 fs_value = extract_fs_15_14_13_12_11(instruction);
-    uint64 ft_value = extract_ft_20_19_18_17_16(instruction);
+    uint64_t fd_value = extract_fd_10_9_8_7_6(instruction);
+    uint64_t fs_value = extract_fs_15_14_13_12_11(instruction);
+    uint64_t ft_value = extract_ft_20_19_18_17_16(instruction);
 
     std::string fd = FPR(copy(fd_value));
     std::string fs = FPR(copy(fs_value));
@@ -4541,11 +4541,11 @@ std::string NMD::CMP_SULE_S(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::CMP_SULT_D(uint64 instruction)
+std::string NMD::CMP_SULT_D(uint64_t instruction)
 {
-    uint64 fd_value = extract_fd_10_9_8_7_6(instruction);
-    uint64 fs_value = extract_fs_15_14_13_12_11(instruction);
-    uint64 ft_value = extract_ft_20_19_18_17_16(instruction);
+    uint64_t fd_value = extract_fd_10_9_8_7_6(instruction);
+    uint64_t fs_value = extract_fs_15_14_13_12_11(instruction);
+    uint64_t ft_value = extract_ft_20_19_18_17_16(instruction);
 
     std::string fd = FPR(copy(fd_value));
     std::string fs = FPR(copy(fs_value));
@@ -4565,11 +4565,11 @@ std::string NMD::CMP_SULT_D(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::CMP_SULT_S(uint64 instruction)
+std::string NMD::CMP_SULT_S(uint64_t instruction)
 {
-    uint64 fd_value = extract_fd_10_9_8_7_6(instruction);
-    uint64 fs_value = extract_fs_15_14_13_12_11(instruction);
-    uint64 ft_value = extract_ft_20_19_18_17_16(instruction);
+    uint64_t fd_value = extract_fd_10_9_8_7_6(instruction);
+    uint64_t fs_value = extract_fs_15_14_13_12_11(instruction);
+    uint64_t ft_value = extract_ft_20_19_18_17_16(instruction);
 
     std::string fd = FPR(copy(fd_value));
     std::string fs = FPR(copy(fs_value));
@@ -4589,11 +4589,11 @@ std::string NMD::CMP_SULT_S(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::CMP_SUN_D(uint64 instruction)
+std::string NMD::CMP_SUN_D(uint64_t instruction)
 {
-    uint64 fd_value = extract_fd_10_9_8_7_6(instruction);
-    uint64 fs_value = extract_fs_15_14_13_12_11(instruction);
-    uint64 ft_value = extract_ft_20_19_18_17_16(instruction);
+    uint64_t fd_value = extract_fd_10_9_8_7_6(instruction);
+    uint64_t fs_value = extract_fs_15_14_13_12_11(instruction);
+    uint64_t ft_value = extract_ft_20_19_18_17_16(instruction);
 
     std::string fd = FPR(copy(fd_value));
     std::string fs = FPR(copy(fs_value));
@@ -4613,11 +4613,11 @@ std::string NMD::CMP_SUN_D(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::CMP_SUNE_D(uint64 instruction)
+std::string NMD::CMP_SUNE_D(uint64_t instruction)
 {
-    uint64 fd_value = extract_fd_10_9_8_7_6(instruction);
-    uint64 fs_value = extract_fs_15_14_13_12_11(instruction);
-    uint64 ft_value = extract_ft_20_19_18_17_16(instruction);
+    uint64_t fd_value = extract_fd_10_9_8_7_6(instruction);
+    uint64_t fs_value = extract_fs_15_14_13_12_11(instruction);
+    uint64_t ft_value = extract_ft_20_19_18_17_16(instruction);
 
     std::string fd = FPR(copy(fd_value));
     std::string fs = FPR(copy(fs_value));
@@ -4637,11 +4637,11 @@ std::string NMD::CMP_SUNE_D(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::CMP_SUNE_S(uint64 instruction)
+std::string NMD::CMP_SUNE_S(uint64_t instruction)
 {
-    uint64 fd_value = extract_fd_10_9_8_7_6(instruction);
-    uint64 fs_value = extract_fs_15_14_13_12_11(instruction);
-    uint64 ft_value = extract_ft_20_19_18_17_16(instruction);
+    uint64_t fd_value = extract_fd_10_9_8_7_6(instruction);
+    uint64_t fs_value = extract_fs_15_14_13_12_11(instruction);
+    uint64_t ft_value = extract_ft_20_19_18_17_16(instruction);
 
     std::string fd = FPR(copy(fd_value));
     std::string fs = FPR(copy(fs_value));
@@ -4661,11 +4661,11 @@ std::string NMD::CMP_SUNE_S(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::CMP_SUN_S(uint64 instruction)
+std::string NMD::CMP_SUN_S(uint64_t instruction)
 {
-    uint64 fd_value = extract_fd_10_9_8_7_6(instruction);
-    uint64 fs_value = extract_fs_15_14_13_12_11(instruction);
-    uint64 ft_value = extract_ft_20_19_18_17_16(instruction);
+    uint64_t fd_value = extract_fd_10_9_8_7_6(instruction);
+    uint64_t fs_value = extract_fs_15_14_13_12_11(instruction);
+    uint64_t ft_value = extract_ft_20_19_18_17_16(instruction);
 
     std::string fd = FPR(copy(fd_value));
     std::string fs = FPR(copy(fs_value));
@@ -4685,11 +4685,11 @@ std::string NMD::CMP_SUN_S(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::CMP_UEQ_D(uint64 instruction)
+std::string NMD::CMP_UEQ_D(uint64_t instruction)
 {
-    uint64 fd_value = extract_fd_10_9_8_7_6(instruction);
-    uint64 fs_value = extract_fs_15_14_13_12_11(instruction);
-    uint64 ft_value = extract_ft_20_19_18_17_16(instruction);
+    uint64_t fd_value = extract_fd_10_9_8_7_6(instruction);
+    uint64_t fs_value = extract_fs_15_14_13_12_11(instruction);
+    uint64_t ft_value = extract_ft_20_19_18_17_16(instruction);
 
     std::string fd = FPR(copy(fd_value));
     std::string fs = FPR(copy(fs_value));
@@ -4709,11 +4709,11 @@ std::string NMD::CMP_UEQ_D(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::CMP_UEQ_S(uint64 instruction)
+std::string NMD::CMP_UEQ_S(uint64_t instruction)
 {
-    uint64 fd_value = extract_fd_10_9_8_7_6(instruction);
-    uint64 fs_value = extract_fs_15_14_13_12_11(instruction);
-    uint64 ft_value = extract_ft_20_19_18_17_16(instruction);
+    uint64_t fd_value = extract_fd_10_9_8_7_6(instruction);
+    uint64_t fs_value = extract_fs_15_14_13_12_11(instruction);
+    uint64_t ft_value = extract_ft_20_19_18_17_16(instruction);
 
     std::string fd = FPR(copy(fd_value));
     std::string fs = FPR(copy(fs_value));
@@ -4733,11 +4733,11 @@ std::string NMD::CMP_UEQ_S(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::CMP_ULE_D(uint64 instruction)
+std::string NMD::CMP_ULE_D(uint64_t instruction)
 {
-    uint64 fd_value = extract_fd_10_9_8_7_6(instruction);
-    uint64 fs_value = extract_fs_15_14_13_12_11(instruction);
-    uint64 ft_value = extract_ft_20_19_18_17_16(instruction);
+    uint64_t fd_value = extract_fd_10_9_8_7_6(instruction);
+    uint64_t fs_value = extract_fs_15_14_13_12_11(instruction);
+    uint64_t ft_value = extract_ft_20_19_18_17_16(instruction);
 
     std::string fd = FPR(copy(fd_value));
     std::string fs = FPR(copy(fs_value));
@@ -4757,11 +4757,11 @@ std::string NMD::CMP_ULE_D(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::CMP_ULE_S(uint64 instruction)
+std::string NMD::CMP_ULE_S(uint64_t instruction)
 {
-    uint64 fd_value = extract_fd_10_9_8_7_6(instruction);
-    uint64 fs_value = extract_fs_15_14_13_12_11(instruction);
-    uint64 ft_value = extract_ft_20_19_18_17_16(instruction);
+    uint64_t fd_value = extract_fd_10_9_8_7_6(instruction);
+    uint64_t fs_value = extract_fs_15_14_13_12_11(instruction);
+    uint64_t ft_value = extract_ft_20_19_18_17_16(instruction);
 
     std::string fd = FPR(copy(fd_value));
     std::string fs = FPR(copy(fs_value));
@@ -4781,11 +4781,11 @@ std::string NMD::CMP_ULE_S(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::CMP_ULT_D(uint64 instruction)
+std::string NMD::CMP_ULT_D(uint64_t instruction)
 {
-    uint64 fd_value = extract_fd_10_9_8_7_6(instruction);
-    uint64 fs_value = extract_fs_15_14_13_12_11(instruction);
-    uint64 ft_value = extract_ft_20_19_18_17_16(instruction);
+    uint64_t fd_value = extract_fd_10_9_8_7_6(instruction);
+    uint64_t fs_value = extract_fs_15_14_13_12_11(instruction);
+    uint64_t ft_value = extract_ft_20_19_18_17_16(instruction);
 
     std::string fd = FPR(copy(fd_value));
     std::string fs = FPR(copy(fs_value));
@@ -4805,11 +4805,11 @@ std::string NMD::CMP_ULT_D(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::CMP_ULT_S(uint64 instruction)
+std::string NMD::CMP_ULT_S(uint64_t instruction)
 {
-    uint64 fd_value = extract_fd_10_9_8_7_6(instruction);
-    uint64 fs_value = extract_fs_15_14_13_12_11(instruction);
-    uint64 ft_value = extract_ft_20_19_18_17_16(instruction);
+    uint64_t fd_value = extract_fd_10_9_8_7_6(instruction);
+    uint64_t fs_value = extract_fs_15_14_13_12_11(instruction);
+    uint64_t ft_value = extract_ft_20_19_18_17_16(instruction);
 
     std::string fd = FPR(copy(fd_value));
     std::string fs = FPR(copy(fs_value));
@@ -4829,11 +4829,11 @@ std::string NMD::CMP_ULT_S(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::CMP_UN_D(uint64 instruction)
+std::string NMD::CMP_UN_D(uint64_t instruction)
 {
-    uint64 fd_value = extract_fd_10_9_8_7_6(instruction);
-    uint64 fs_value = extract_fs_15_14_13_12_11(instruction);
-    uint64 ft_value = extract_ft_20_19_18_17_16(instruction);
+    uint64_t fd_value = extract_fd_10_9_8_7_6(instruction);
+    uint64_t fs_value = extract_fs_15_14_13_12_11(instruction);
+    uint64_t ft_value = extract_ft_20_19_18_17_16(instruction);
 
     std::string fd = FPR(copy(fd_value));
     std::string fs = FPR(copy(fs_value));
@@ -4853,11 +4853,11 @@ std::string NMD::CMP_UN_D(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::CMP_UNE_D(uint64 instruction)
+std::string NMD::CMP_UNE_D(uint64_t instruction)
 {
-    uint64 fd_value = extract_fd_10_9_8_7_6(instruction);
-    uint64 fs_value = extract_fs_15_14_13_12_11(instruction);
-    uint64 ft_value = extract_ft_20_19_18_17_16(instruction);
+    uint64_t fd_value = extract_fd_10_9_8_7_6(instruction);
+    uint64_t fs_value = extract_fs_15_14_13_12_11(instruction);
+    uint64_t ft_value = extract_ft_20_19_18_17_16(instruction);
 
     std::string fd = FPR(copy(fd_value));
     std::string fs = FPR(copy(fs_value));
@@ -4877,11 +4877,11 @@ std::string NMD::CMP_UNE_D(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::CMP_UNE_S(uint64 instruction)
+std::string NMD::CMP_UNE_S(uint64_t instruction)
 {
-    uint64 fd_value = extract_fd_10_9_8_7_6(instruction);
-    uint64 fs_value = extract_fs_15_14_13_12_11(instruction);
-    uint64 ft_value = extract_ft_20_19_18_17_16(instruction);
+    uint64_t fd_value = extract_fd_10_9_8_7_6(instruction);
+    uint64_t fs_value = extract_fs_15_14_13_12_11(instruction);
+    uint64_t ft_value = extract_ft_20_19_18_17_16(instruction);
 
     std::string fd = FPR(copy(fd_value));
     std::string fs = FPR(copy(fs_value));
@@ -4901,11 +4901,11 @@ std::string NMD::CMP_UNE_S(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::CMP_UN_S(uint64 instruction)
+std::string NMD::CMP_UN_S(uint64_t instruction)
 {
-    uint64 fd_value = extract_fd_10_9_8_7_6(instruction);
-    uint64 fs_value = extract_fs_15_14_13_12_11(instruction);
-    uint64 ft_value = extract_ft_20_19_18_17_16(instruction);
+    uint64_t fd_value = extract_fd_10_9_8_7_6(instruction);
+    uint64_t fs_value = extract_fs_15_14_13_12_11(instruction);
+    uint64_t ft_value = extract_ft_20_19_18_17_16(instruction);
 
     std::string fd = FPR(copy(fd_value));
     std::string fs = FPR(copy(fs_value));
@@ -4925,11 +4925,11 @@ std::string NMD::CMP_UN_S(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::CMPGDU_EQ_QB(uint64 instruction)
+std::string NMD::CMPGDU_EQ_QB(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 rd_value = extract_rd_20_19_18_17_16(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t rd_value = extract_rd_20_19_18_17_16(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rd = GPR(copy(rd_value));
     std::string rs = GPR(copy(rs_value));
@@ -4949,11 +4949,11 @@ std::string NMD::CMPGDU_EQ_QB(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::CMPGDU_LE_QB(uint64 instruction)
+std::string NMD::CMPGDU_LE_QB(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 rd_value = extract_rd_20_19_18_17_16(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t rd_value = extract_rd_20_19_18_17_16(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rd = GPR(copy(rd_value));
     std::string rs = GPR(copy(rs_value));
@@ -4973,11 +4973,11 @@ std::string NMD::CMPGDU_LE_QB(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::CMPGDU_LT_QB(uint64 instruction)
+std::string NMD::CMPGDU_LT_QB(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 rd_value = extract_rd_20_19_18_17_16(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t rd_value = extract_rd_20_19_18_17_16(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rd = GPR(copy(rd_value));
     std::string rs = GPR(copy(rs_value));
@@ -4997,11 +4997,11 @@ std::string NMD::CMPGDU_LT_QB(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::CMPGU_EQ_QB(uint64 instruction)
+std::string NMD::CMPGU_EQ_QB(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 rd_value = extract_rd_20_19_18_17_16(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t rd_value = extract_rd_20_19_18_17_16(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rd = GPR(copy(rd_value));
     std::string rs = GPR(copy(rs_value));
@@ -5021,11 +5021,11 @@ std::string NMD::CMPGU_EQ_QB(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::CMPGU_LE_QB(uint64 instruction)
+std::string NMD::CMPGU_LE_QB(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 rd_value = extract_rd_20_19_18_17_16(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t rd_value = extract_rd_20_19_18_17_16(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rd = GPR(copy(rd_value));
     std::string rs = GPR(copy(rs_value));
@@ -5045,11 +5045,11 @@ std::string NMD::CMPGU_LE_QB(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::CMPGU_LT_QB(uint64 instruction)
+std::string NMD::CMPGU_LT_QB(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 rd_value = extract_rd_20_19_18_17_16(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t rd_value = extract_rd_20_19_18_17_16(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rd = GPR(copy(rd_value));
     std::string rs = GPR(copy(rs_value));
@@ -5069,10 +5069,10 @@ std::string NMD::CMPGU_LT_QB(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::CMPU_EQ_QB(uint64 instruction)
+std::string NMD::CMPU_EQ_QB(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rs = GPR(copy(rs_value));
     std::string rt = GPR(copy(rt_value));
@@ -5091,10 +5091,10 @@ std::string NMD::CMPU_EQ_QB(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::CMPU_LE_QB(uint64 instruction)
+std::string NMD::CMPU_LE_QB(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rs = GPR(copy(rs_value));
     std::string rt = GPR(copy(rt_value));
@@ -5113,10 +5113,10 @@ std::string NMD::CMPU_LE_QB(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::CMPU_LT_QB(uint64 instruction)
+std::string NMD::CMPU_LT_QB(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rs = GPR(copy(rs_value));
     std::string rt = GPR(copy(rt_value));
@@ -5135,9 +5135,9 @@ std::string NMD::CMPU_LT_QB(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::COP2_1(uint64 instruction)
+std::string NMD::COP2_1(uint64_t instruction)
 {
-    uint64 cofun_value = extract_cofun_25_24_23(instruction);
+    uint64_t cofun_value = extract_cofun_25_24_23(instruction);
 
     std::string cofun = IMMEDIATE(copy(cofun_value));
 
@@ -5155,10 +5155,10 @@ std::string NMD::COP2_1(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::CTC1(uint64 instruction)
+std::string NMD::CTC1(uint64_t instruction)
 {
-    uint64 cs_value = extract_cs_20_19_18_17_16(instruction);
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t cs_value = extract_cs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
 
     std::string rt = GPR(copy(rt_value));
     std::string cs = CPR(copy(cs_value));
@@ -5177,10 +5177,10 @@ std::string NMD::CTC1(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::CTC2(uint64 instruction)
+std::string NMD::CTC2(uint64_t instruction)
 {
-    uint64 cs_value = extract_cs_20_19_18_17_16(instruction);
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t cs_value = extract_cs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
 
     std::string rt = GPR(copy(rt_value));
     std::string cs = CPR(copy(cs_value));
@@ -5199,10 +5199,10 @@ std::string NMD::CTC2(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::CVT_D_L(uint64 instruction)
+std::string NMD::CVT_D_L(uint64_t instruction)
 {
-    uint64 fs_value = extract_fs_15_14_13_12_11(instruction);
-    uint64 ft_value = extract_ft_20_19_18_17_16(instruction);
+    uint64_t fs_value = extract_fs_15_14_13_12_11(instruction);
+    uint64_t ft_value = extract_ft_20_19_18_17_16(instruction);
 
     std::string ft = FPR(copy(ft_value));
     std::string fs = FPR(copy(fs_value));
@@ -5221,10 +5221,10 @@ std::string NMD::CVT_D_L(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::CVT_D_S(uint64 instruction)
+std::string NMD::CVT_D_S(uint64_t instruction)
 {
-    uint64 fs_value = extract_fs_15_14_13_12_11(instruction);
-    uint64 ft_value = extract_ft_20_19_18_17_16(instruction);
+    uint64_t fs_value = extract_fs_15_14_13_12_11(instruction);
+    uint64_t ft_value = extract_ft_20_19_18_17_16(instruction);
 
     std::string ft = FPR(copy(ft_value));
     std::string fs = FPR(copy(fs_value));
@@ -5243,10 +5243,10 @@ std::string NMD::CVT_D_S(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::CVT_D_W(uint64 instruction)
+std::string NMD::CVT_D_W(uint64_t instruction)
 {
-    uint64 fs_value = extract_fs_15_14_13_12_11(instruction);
-    uint64 ft_value = extract_ft_20_19_18_17_16(instruction);
+    uint64_t fs_value = extract_fs_15_14_13_12_11(instruction);
+    uint64_t ft_value = extract_ft_20_19_18_17_16(instruction);
 
     std::string ft = FPR(copy(ft_value));
     std::string fs = FPR(copy(fs_value));
@@ -5265,10 +5265,10 @@ std::string NMD::CVT_D_W(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::CVT_L_D(uint64 instruction)
+std::string NMD::CVT_L_D(uint64_t instruction)
 {
-    uint64 fs_value = extract_fs_15_14_13_12_11(instruction);
-    uint64 ft_value = extract_ft_20_19_18_17_16(instruction);
+    uint64_t fs_value = extract_fs_15_14_13_12_11(instruction);
+    uint64_t ft_value = extract_ft_20_19_18_17_16(instruction);
 
     std::string ft = FPR(copy(ft_value));
     std::string fs = FPR(copy(fs_value));
@@ -5287,10 +5287,10 @@ std::string NMD::CVT_L_D(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::CVT_L_S(uint64 instruction)
+std::string NMD::CVT_L_S(uint64_t instruction)
 {
-    uint64 fs_value = extract_fs_15_14_13_12_11(instruction);
-    uint64 ft_value = extract_ft_20_19_18_17_16(instruction);
+    uint64_t fs_value = extract_fs_15_14_13_12_11(instruction);
+    uint64_t ft_value = extract_ft_20_19_18_17_16(instruction);
 
     std::string ft = FPR(copy(ft_value));
     std::string fs = FPR(copy(fs_value));
@@ -5309,10 +5309,10 @@ std::string NMD::CVT_L_S(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::CVT_S_D(uint64 instruction)
+std::string NMD::CVT_S_D(uint64_t instruction)
 {
-    uint64 fs_value = extract_fs_15_14_13_12_11(instruction);
-    uint64 ft_value = extract_ft_20_19_18_17_16(instruction);
+    uint64_t fs_value = extract_fs_15_14_13_12_11(instruction);
+    uint64_t ft_value = extract_ft_20_19_18_17_16(instruction);
 
     std::string ft = FPR(copy(ft_value));
     std::string fs = FPR(copy(fs_value));
@@ -5331,10 +5331,10 @@ std::string NMD::CVT_S_D(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::CVT_S_L(uint64 instruction)
+std::string NMD::CVT_S_L(uint64_t instruction)
 {
-    uint64 fs_value = extract_fs_15_14_13_12_11(instruction);
-    uint64 ft_value = extract_ft_20_19_18_17_16(instruction);
+    uint64_t fs_value = extract_fs_15_14_13_12_11(instruction);
+    uint64_t ft_value = extract_ft_20_19_18_17_16(instruction);
 
     std::string ft = FPR(copy(ft_value));
     std::string fs = FPR(copy(fs_value));
@@ -5353,10 +5353,10 @@ std::string NMD::CVT_S_L(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::CVT_S_PL(uint64 instruction)
+std::string NMD::CVT_S_PL(uint64_t instruction)
 {
-    uint64 fs_value = extract_fs_15_14_13_12_11(instruction);
-    uint64 ft_value = extract_ft_20_19_18_17_16(instruction);
+    uint64_t fs_value = extract_fs_15_14_13_12_11(instruction);
+    uint64_t ft_value = extract_ft_20_19_18_17_16(instruction);
 
     std::string ft = FPR(copy(ft_value));
     std::string fs = FPR(copy(fs_value));
@@ -5375,10 +5375,10 @@ std::string NMD::CVT_S_PL(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::CVT_S_PU(uint64 instruction)
+std::string NMD::CVT_S_PU(uint64_t instruction)
 {
-    uint64 fs_value = extract_fs_15_14_13_12_11(instruction);
-    uint64 ft_value = extract_ft_20_19_18_17_16(instruction);
+    uint64_t fs_value = extract_fs_15_14_13_12_11(instruction);
+    uint64_t ft_value = extract_ft_20_19_18_17_16(instruction);
 
     std::string ft = FPR(copy(ft_value));
     std::string fs = FPR(copy(fs_value));
@@ -5397,10 +5397,10 @@ std::string NMD::CVT_S_PU(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::CVT_S_W(uint64 instruction)
+std::string NMD::CVT_S_W(uint64_t instruction)
 {
-    uint64 fs_value = extract_fs_15_14_13_12_11(instruction);
-    uint64 ft_value = extract_ft_20_19_18_17_16(instruction);
+    uint64_t fs_value = extract_fs_15_14_13_12_11(instruction);
+    uint64_t ft_value = extract_ft_20_19_18_17_16(instruction);
 
     std::string ft = FPR(copy(ft_value));
     std::string fs = FPR(copy(fs_value));
@@ -5419,10 +5419,10 @@ std::string NMD::CVT_S_W(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::CVT_W_D(uint64 instruction)
+std::string NMD::CVT_W_D(uint64_t instruction)
 {
-    uint64 fs_value = extract_fs_15_14_13_12_11(instruction);
-    uint64 ft_value = extract_ft_20_19_18_17_16(instruction);
+    uint64_t fs_value = extract_fs_15_14_13_12_11(instruction);
+    uint64_t ft_value = extract_ft_20_19_18_17_16(instruction);
 
     std::string ft = FPR(copy(ft_value));
     std::string fs = FPR(copy(fs_value));
@@ -5441,10 +5441,10 @@ std::string NMD::CVT_W_D(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::CVT_W_S(uint64 instruction)
+std::string NMD::CVT_W_S(uint64_t instruction)
 {
-    uint64 fs_value = extract_fs_15_14_13_12_11(instruction);
-    uint64 ft_value = extract_ft_20_19_18_17_16(instruction);
+    uint64_t fs_value = extract_fs_15_14_13_12_11(instruction);
+    uint64_t ft_value = extract_ft_20_19_18_17_16(instruction);
 
     std::string ft = FPR(copy(ft_value));
     std::string fs = FPR(copy(fs_value));
@@ -5463,10 +5463,10 @@ std::string NMD::CVT_W_S(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::DADDIU_48_(uint64 instruction)
+std::string NMD::DADDIU_48_(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_41_40_39_38_37(instruction);
-    int64 s_value = extr_sil0il16bs16_il16il0bs16Tmsb31(instruction);
+    uint64_t rt_value = extract_rt_41_40_39_38_37(instruction);
+    int64_t s_value = extr_sil0il16bs16_il16il0bs16Tmsb31(instruction);
 
     std::string rt = GPR(copy(rt_value));
     std::string s = IMMEDIATE(copy(s_value));
@@ -5485,11 +5485,11 @@ std::string NMD::DADDIU_48_(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::DADDIU_NEG_(uint64 instruction)
+std::string NMD::DADDIU_NEG_(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 u_value = extract_u_11_10_9_8_7_6_5_4_3_2_1_0(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t u_value = extract_u_11_10_9_8_7_6_5_4_3_2_1_0(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rt = GPR(copy(rt_value));
     std::string rs = GPR(copy(rs_value));
@@ -5509,11 +5509,11 @@ std::string NMD::DADDIU_NEG_(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::DADDIU_U12_(uint64 instruction)
+std::string NMD::DADDIU_U12_(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 u_value = extract_u_11_10_9_8_7_6_5_4_3_2_1_0(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t u_value = extract_u_11_10_9_8_7_6_5_4_3_2_1_0(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rt = GPR(copy(rt_value));
     std::string rs = GPR(copy(rs_value));
@@ -5533,11 +5533,11 @@ std::string NMD::DADDIU_U12_(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::DADD(uint64 instruction)
+std::string NMD::DADD(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 rd_value = extract_rd_20_19_18_17_16(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t rd_value = extract_rd_20_19_18_17_16(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rd = GPR(copy(rd_value));
     std::string rs = GPR(copy(rs_value));
@@ -5557,11 +5557,11 @@ std::string NMD::DADD(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::DADDU(uint64 instruction)
+std::string NMD::DADDU(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 rd_value = extract_rd_20_19_18_17_16(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t rd_value = extract_rd_20_19_18_17_16(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rd = GPR(copy(rd_value));
     std::string rs = GPR(copy(rs_value));
@@ -5581,10 +5581,10 @@ std::string NMD::DADDU(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::DCLO(uint64 instruction)
+std::string NMD::DCLO(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rt = GPR(copy(rt_value));
     std::string rs = GPR(copy(rs_value));
@@ -5603,10 +5603,10 @@ std::string NMD::DCLO(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::DCLZ(uint64 instruction)
+std::string NMD::DCLZ(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rt = GPR(copy(rt_value));
     std::string rs = GPR(copy(rs_value));
@@ -5625,11 +5625,11 @@ std::string NMD::DCLZ(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::DDIV(uint64 instruction)
+std::string NMD::DDIV(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 rd_value = extract_rd_20_19_18_17_16(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t rd_value = extract_rd_20_19_18_17_16(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rd = GPR(copy(rd_value));
     std::string rs = GPR(copy(rs_value));
@@ -5649,11 +5649,11 @@ std::string NMD::DDIV(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::DDIVU(uint64 instruction)
+std::string NMD::DDIVU(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 rd_value = extract_rd_20_19_18_17_16(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t rd_value = extract_rd_20_19_18_17_16(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rd = GPR(copy(rd_value));
     std::string rs = GPR(copy(rs_value));
@@ -5673,7 +5673,7 @@ std::string NMD::DDIVU(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::DERET(uint64 instruction)
+std::string NMD::DERET(uint64_t instruction)
 {
     (void)instruction;
 
@@ -5691,12 +5691,12 @@ std::string NMD::DERET(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::DEXTM(uint64 instruction)
+std::string NMD::DEXTM(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 msbd_value = extract_msbt_10_9_8_7_6(instruction);
-    uint64 lsb_value = extract_lsb_4_3_2_1_0(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t msbd_value = extract_msbt_10_9_8_7_6(instruction);
+    uint64_t lsb_value = extract_lsb_4_3_2_1_0(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rt = GPR(copy(rt_value));
     std::string rs = GPR(copy(rs_value));
@@ -5717,12 +5717,12 @@ std::string NMD::DEXTM(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::DEXT(uint64 instruction)
+std::string NMD::DEXT(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 msbd_value = extract_msbt_10_9_8_7_6(instruction);
-    uint64 lsb_value = extract_lsb_4_3_2_1_0(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t msbd_value = extract_msbt_10_9_8_7_6(instruction);
+    uint64_t lsb_value = extract_lsb_4_3_2_1_0(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rt = GPR(copy(rt_value));
     std::string rs = GPR(copy(rs_value));
@@ -5743,12 +5743,12 @@ std::string NMD::DEXT(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::DEXTU(uint64 instruction)
+std::string NMD::DEXTU(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 msbd_value = extract_msbt_10_9_8_7_6(instruction);
-    uint64 lsb_value = extract_lsb_4_3_2_1_0(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t msbd_value = extract_msbt_10_9_8_7_6(instruction);
+    uint64_t lsb_value = extract_lsb_4_3_2_1_0(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rt = GPR(copy(rt_value));
     std::string rs = GPR(copy(rs_value));
@@ -5769,12 +5769,12 @@ std::string NMD::DEXTU(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::DINSM(uint64 instruction)
+std::string NMD::DINSM(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 msbd_value = extract_msbt_10_9_8_7_6(instruction);
-    uint64 lsb_value = extract_lsb_4_3_2_1_0(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t msbd_value = extract_msbt_10_9_8_7_6(instruction);
+    uint64_t lsb_value = extract_lsb_4_3_2_1_0(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rt = GPR(copy(rt_value));
     std::string rs = GPR(copy(rs_value));
@@ -5797,12 +5797,12 @@ std::string NMD::DINSM(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::DINS(uint64 instruction)
+std::string NMD::DINS(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 msbd_value = extract_msbt_10_9_8_7_6(instruction);
-    uint64 lsb_value = extract_lsb_4_3_2_1_0(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t msbd_value = extract_msbt_10_9_8_7_6(instruction);
+    uint64_t lsb_value = extract_lsb_4_3_2_1_0(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rt = GPR(copy(rt_value));
     std::string rs = GPR(copy(rs_value));
@@ -5825,12 +5825,12 @@ std::string NMD::DINS(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::DINSU(uint64 instruction)
+std::string NMD::DINSU(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 msbd_value = extract_msbt_10_9_8_7_6(instruction);
-    uint64 lsb_value = extract_lsb_4_3_2_1_0(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t msbd_value = extract_msbt_10_9_8_7_6(instruction);
+    uint64_t lsb_value = extract_lsb_4_3_2_1_0(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rt = GPR(copy(rt_value));
     std::string rs = GPR(copy(rs_value));
@@ -5853,9 +5853,9 @@ std::string NMD::DINSU(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::DI(uint64 instruction)
+std::string NMD::DI(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
 
     std::string rt = GPR(copy(rt_value));
 
@@ -5873,11 +5873,11 @@ std::string NMD::DI(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::DIV(uint64 instruction)
+std::string NMD::DIV(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 rd_value = extract_rd_20_19_18_17_16(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t rd_value = extract_rd_20_19_18_17_16(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rd = GPR(copy(rd_value));
     std::string rs = GPR(copy(rs_value));
@@ -5897,11 +5897,11 @@ std::string NMD::DIV(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::DIV_D(uint64 instruction)
+std::string NMD::DIV_D(uint64_t instruction)
 {
-    uint64 fs_value = extract_fs_15_14_13_12_11(instruction);
-    uint64 ft_value = extract_ft_20_19_18_17_16(instruction);
-    uint64 fd_value = extract_fd_10_9_8_7_6(instruction);
+    uint64_t fs_value = extract_fs_15_14_13_12_11(instruction);
+    uint64_t ft_value = extract_ft_20_19_18_17_16(instruction);
+    uint64_t fd_value = extract_fd_10_9_8_7_6(instruction);
 
     std::string fd = FPR(copy(fd_value));
     std::string fs = FPR(copy(fs_value));
@@ -5921,11 +5921,11 @@ std::string NMD::DIV_D(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::DIV_S(uint64 instruction)
+std::string NMD::DIV_S(uint64_t instruction)
 {
-    uint64 fs_value = extract_fs_15_14_13_12_11(instruction);
-    uint64 ft_value = extract_ft_20_19_18_17_16(instruction);
-    uint64 fd_value = extract_fd_10_9_8_7_6(instruction);
+    uint64_t fs_value = extract_fs_15_14_13_12_11(instruction);
+    uint64_t ft_value = extract_ft_20_19_18_17_16(instruction);
+    uint64_t fd_value = extract_fd_10_9_8_7_6(instruction);
 
     std::string fd = FPR(copy(fd_value));
     std::string fs = FPR(copy(fs_value));
@@ -5945,11 +5945,11 @@ std::string NMD::DIV_S(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::DIVU(uint64 instruction)
+std::string NMD::DIVU(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 rd_value = extract_rd_20_19_18_17_16(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t rd_value = extract_rd_20_19_18_17_16(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rd = GPR(copy(rd_value));
     std::string rs = GPR(copy(rs_value));
@@ -5969,12 +5969,12 @@ std::string NMD::DIVU(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::DLSA(uint64 instruction)
+std::string NMD::DLSA(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 rd_value = extract_rd_20_19_18_17_16(instruction);
-    uint64 u2_value = extract_u2_10_9(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t rd_value = extract_rd_20_19_18_17_16(instruction);
+    uint64_t u2_value = extract_u2_10_9(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rd = GPR(copy(rd_value));
     std::string rs = GPR(copy(rs_value));
@@ -5995,10 +5995,10 @@ std::string NMD::DLSA(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::DLUI_48_(uint64 instruction)
+std::string NMD::DLUI_48_(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_41_40_39_38_37(instruction);
-    uint64 u_value = extr_uil0il32bs32Fmsb63(instruction);
+    uint64_t rt_value = extract_rt_41_40_39_38_37(instruction);
+    uint64_t u_value = extr_uil0il32bs32Fmsb63(instruction);
 
     std::string rt = GPR(copy(rt_value));
     std::string u = IMMEDIATE(copy(u_value));
@@ -6017,11 +6017,11 @@ std::string NMD::DLUI_48_(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::DMFC0(uint64 instruction)
+std::string NMD::DMFC0(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 c0s_value = extract_c0s_20_19_18_17_16(instruction);
-    uint64 sel_value = extract_sel_15_14_13_12_11(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t c0s_value = extract_c0s_20_19_18_17_16(instruction);
+    uint64_t sel_value = extract_sel_15_14_13_12_11(instruction);
 
     std::string rt = GPR(copy(rt_value));
     std::string c0s = CPR(copy(c0s_value));
@@ -6041,10 +6041,10 @@ std::string NMD::DMFC0(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::DMFC1(uint64 instruction)
+std::string NMD::DMFC1(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 fs_value = extract_fs_15_14_13_12_11(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t fs_value = extract_fs_15_14_13_12_11(instruction);
 
     std::string rt = GPR(copy(rt_value));
     std::string fs = FPR(copy(fs_value));
@@ -6063,10 +6063,10 @@ std::string NMD::DMFC1(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::DMFC2(uint64 instruction)
+std::string NMD::DMFC2(uint64_t instruction)
 {
-    uint64 cs_value = extract_cs_20_19_18_17_16(instruction);
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t cs_value = extract_cs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
 
     std::string rt = GPR(copy(rt_value));
     std::string cs = CPR(copy(cs_value));
@@ -6085,11 +6085,11 @@ std::string NMD::DMFC2(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::DMFGC0(uint64 instruction)
+std::string NMD::DMFGC0(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 c0s_value = extract_c0s_20_19_18_17_16(instruction);
-    uint64 sel_value = extract_sel_15_14_13_12_11(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t c0s_value = extract_c0s_20_19_18_17_16(instruction);
+    uint64_t sel_value = extract_sel_15_14_13_12_11(instruction);
 
     std::string rt = GPR(copy(rt_value));
     std::string c0s = CPR(copy(c0s_value));
@@ -6109,11 +6109,11 @@ std::string NMD::DMFGC0(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::DMOD(uint64 instruction)
+std::string NMD::DMOD(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 rd_value = extract_rd_20_19_18_17_16(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t rd_value = extract_rd_20_19_18_17_16(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rd = GPR(copy(rd_value));
     std::string rs = GPR(copy(rs_value));
@@ -6133,11 +6133,11 @@ std::string NMD::DMOD(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::DMODU(uint64 instruction)
+std::string NMD::DMODU(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 rd_value = extract_rd_20_19_18_17_16(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t rd_value = extract_rd_20_19_18_17_16(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rd = GPR(copy(rd_value));
     std::string rs = GPR(copy(rs_value));
@@ -6157,11 +6157,11 @@ std::string NMD::DMODU(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::DMTC0(uint64 instruction)
+std::string NMD::DMTC0(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 c0s_value = extract_c0s_20_19_18_17_16(instruction);
-    uint64 sel_value = extract_sel_15_14_13_12_11(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t c0s_value = extract_c0s_20_19_18_17_16(instruction);
+    uint64_t sel_value = extract_sel_15_14_13_12_11(instruction);
 
     std::string rt = GPR(copy(rt_value));
     std::string c0s = CPR(copy(c0s_value));
@@ -6181,10 +6181,10 @@ std::string NMD::DMTC0(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::DMTC1(uint64 instruction)
+std::string NMD::DMTC1(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 fs_value = extract_fs_15_14_13_12_11(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t fs_value = extract_fs_15_14_13_12_11(instruction);
 
     std::string rt = GPR(copy(rt_value));
     std::string fs = FPR(copy(fs_value));
@@ -6203,10 +6203,10 @@ std::string NMD::DMTC1(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::DMTC2(uint64 instruction)
+std::string NMD::DMTC2(uint64_t instruction)
 {
-    uint64 cs_value = extract_cs_20_19_18_17_16(instruction);
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t cs_value = extract_cs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
 
     std::string rt = GPR(copy(rt_value));
     std::string cs = CPR(copy(cs_value));
@@ -6225,11 +6225,11 @@ std::string NMD::DMTC2(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::DMTGC0(uint64 instruction)
+std::string NMD::DMTGC0(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 c0s_value = extract_c0s_20_19_18_17_16(instruction);
-    uint64 sel_value = extract_sel_15_14_13_12_11(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t c0s_value = extract_c0s_20_19_18_17_16(instruction);
+    uint64_t sel_value = extract_sel_15_14_13_12_11(instruction);
 
     std::string rt = GPR(copy(rt_value));
     std::string c0s = CPR(copy(c0s_value));
@@ -6249,9 +6249,9 @@ std::string NMD::DMTGC0(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::DMT(uint64 instruction)
+std::string NMD::DMT(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
 
     std::string rt = GPR(copy(rt_value));
 
@@ -6269,11 +6269,11 @@ std::string NMD::DMT(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::DMUH(uint64 instruction)
+std::string NMD::DMUH(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 rd_value = extract_rd_20_19_18_17_16(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t rd_value = extract_rd_20_19_18_17_16(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rd = GPR(copy(rd_value));
     std::string rs = GPR(copy(rs_value));
@@ -6293,11 +6293,11 @@ std::string NMD::DMUH(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::DMUHU(uint64 instruction)
+std::string NMD::DMUHU(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 rd_value = extract_rd_20_19_18_17_16(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t rd_value = extract_rd_20_19_18_17_16(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rd = GPR(copy(rd_value));
     std::string rs = GPR(copy(rs_value));
@@ -6317,11 +6317,11 @@ std::string NMD::DMUHU(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::DMUL(uint64 instruction)
+std::string NMD::DMUL(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 rd_value = extract_rd_20_19_18_17_16(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t rd_value = extract_rd_20_19_18_17_16(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rd = GPR(copy(rd_value));
     std::string rs = GPR(copy(rs_value));
@@ -6341,11 +6341,11 @@ std::string NMD::DMUL(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::DMULU(uint64 instruction)
+std::string NMD::DMULU(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 rd_value = extract_rd_20_19_18_17_16(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t rd_value = extract_rd_20_19_18_17_16(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rd = GPR(copy(rd_value));
     std::string rs = GPR(copy(rs_value));
@@ -6365,11 +6365,11 @@ std::string NMD::DMULU(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::DPA_W_PH(uint64 instruction)
+std::string NMD::DPA_W_PH(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 ac_value = extract_ac_13_12(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t ac_value = extract_ac_13_12(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string ac = AC(copy(ac_value));
     std::string rs = GPR(copy(rs_value));
@@ -6389,11 +6389,11 @@ std::string NMD::DPA_W_PH(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::DPAQ_SA_L_W(uint64 instruction)
+std::string NMD::DPAQ_SA_L_W(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 ac_value = extract_ac_13_12(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t ac_value = extract_ac_13_12(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string ac = AC(copy(ac_value));
     std::string rs = GPR(copy(rs_value));
@@ -6413,11 +6413,11 @@ std::string NMD::DPAQ_SA_L_W(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::DPAQ_S_W_PH(uint64 instruction)
+std::string NMD::DPAQ_S_W_PH(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 ac_value = extract_ac_13_12(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t ac_value = extract_ac_13_12(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string ac = AC(copy(ac_value));
     std::string rs = GPR(copy(rs_value));
@@ -6437,11 +6437,11 @@ std::string NMD::DPAQ_S_W_PH(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::DPAQX_SA_W_PH(uint64 instruction)
+std::string NMD::DPAQX_SA_W_PH(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 ac_value = extract_ac_13_12(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t ac_value = extract_ac_13_12(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string ac = AC(copy(ac_value));
     std::string rs = GPR(copy(rs_value));
@@ -6461,11 +6461,11 @@ std::string NMD::DPAQX_SA_W_PH(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::DPAQX_S_W_PH(uint64 instruction)
+std::string NMD::DPAQX_S_W_PH(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 ac_value = extract_ac_13_12(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t ac_value = extract_ac_13_12(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string ac = AC(copy(ac_value));
     std::string rs = GPR(copy(rs_value));
@@ -6485,11 +6485,11 @@ std::string NMD::DPAQX_S_W_PH(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::DPAU_H_QBL(uint64 instruction)
+std::string NMD::DPAU_H_QBL(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 ac_value = extract_ac_13_12(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t ac_value = extract_ac_13_12(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string ac = AC(copy(ac_value));
     std::string rs = GPR(copy(rs_value));
@@ -6509,11 +6509,11 @@ std::string NMD::DPAU_H_QBL(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::DPAU_H_QBR(uint64 instruction)
+std::string NMD::DPAU_H_QBR(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 ac_value = extract_ac_13_12(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t ac_value = extract_ac_13_12(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string ac = AC(copy(ac_value));
     std::string rs = GPR(copy(rs_value));
@@ -6533,11 +6533,11 @@ std::string NMD::DPAU_H_QBR(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::DPAX_W_PH(uint64 instruction)
+std::string NMD::DPAX_W_PH(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 ac_value = extract_ac_13_12(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t ac_value = extract_ac_13_12(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string ac = AC(copy(ac_value));
     std::string rs = GPR(copy(rs_value));
@@ -6557,11 +6557,11 @@ std::string NMD::DPAX_W_PH(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::DPS_W_PH(uint64 instruction)
+std::string NMD::DPS_W_PH(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 ac_value = extract_ac_13_12(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t ac_value = extract_ac_13_12(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string ac = AC(copy(ac_value));
     std::string rs = GPR(copy(rs_value));
@@ -6581,11 +6581,11 @@ std::string NMD::DPS_W_PH(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::DPSQ_SA_L_W(uint64 instruction)
+std::string NMD::DPSQ_SA_L_W(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 ac_value = extract_ac_13_12(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t ac_value = extract_ac_13_12(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string ac = AC(copy(ac_value));
     std::string rs = GPR(copy(rs_value));
@@ -6605,11 +6605,11 @@ std::string NMD::DPSQ_SA_L_W(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::DPSQ_S_W_PH(uint64 instruction)
+std::string NMD::DPSQ_S_W_PH(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 ac_value = extract_ac_13_12(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t ac_value = extract_ac_13_12(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string ac = AC(copy(ac_value));
     std::string rs = GPR(copy(rs_value));
@@ -6629,11 +6629,11 @@ std::string NMD::DPSQ_S_W_PH(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::DPSQX_SA_W_PH(uint64 instruction)
+std::string NMD::DPSQX_SA_W_PH(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 ac_value = extract_ac_13_12(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t ac_value = extract_ac_13_12(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string ac = AC(copy(ac_value));
     std::string rs = GPR(copy(rs_value));
@@ -6653,11 +6653,11 @@ std::string NMD::DPSQX_SA_W_PH(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::DPSQX_S_W_PH(uint64 instruction)
+std::string NMD::DPSQX_S_W_PH(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 ac_value = extract_ac_13_12(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t ac_value = extract_ac_13_12(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string ac = AC(copy(ac_value));
     std::string rs = GPR(copy(rs_value));
@@ -6677,11 +6677,11 @@ std::string NMD::DPSQX_S_W_PH(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::DPSU_H_QBL(uint64 instruction)
+std::string NMD::DPSU_H_QBL(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 ac_value = extract_ac_13_12(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t ac_value = extract_ac_13_12(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string ac = AC(copy(ac_value));
     std::string rs = GPR(copy(rs_value));
@@ -6701,11 +6701,11 @@ std::string NMD::DPSU_H_QBL(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::DPSU_H_QBR(uint64 instruction)
+std::string NMD::DPSU_H_QBR(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 ac_value = extract_ac_13_12(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t ac_value = extract_ac_13_12(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string ac = AC(copy(ac_value));
     std::string rs = GPR(copy(rs_value));
@@ -6725,11 +6725,11 @@ std::string NMD::DPSU_H_QBR(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::DPSX_W_PH(uint64 instruction)
+std::string NMD::DPSX_W_PH(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 ac_value = extract_ac_13_12(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t ac_value = extract_ac_13_12(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string ac = AC(copy(ac_value));
     std::string rs = GPR(copy(rs_value));
@@ -6749,11 +6749,11 @@ std::string NMD::DPSX_W_PH(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::DROTR(uint64 instruction)
+std::string NMD::DROTR(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 shift_value = extract_shift_4_3_2_1_0(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t shift_value = extract_shift_4_3_2_1_0(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rt = GPR(copy(rt_value));
     std::string rs = GPR(copy(rs_value));
@@ -6773,11 +6773,11 @@ std::string NMD::DROTR(uint64 instruction)
  *          rs -----
  *                       shift -----
  */
-std::string NMD::DROTR32(uint64 instruction)
+std::string NMD::DROTR32(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 shift_value = extract_shift_4_3_2_1_0(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t shift_value = extract_shift_4_3_2_1_0(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rt = GPR(copy(rt_value));
     std::string rs = GPR(copy(rs_value));
@@ -6797,11 +6797,11 @@ std::string NMD::DROTR32(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::DROTRV(uint64 instruction)
+std::string NMD::DROTRV(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 rd_value = extract_rd_20_19_18_17_16(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t rd_value = extract_rd_20_19_18_17_16(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rd = GPR(copy(rd_value));
     std::string rs = GPR(copy(rs_value));
@@ -6821,12 +6821,12 @@ std::string NMD::DROTRV(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::DROTX(uint64 instruction)
+std::string NMD::DROTX(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 shift_value = extract_shift_5_4_3_2_1_0(instruction);
-    uint64 shiftx_value = extract_shiftx_11_10_9_8_7_6(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t shift_value = extract_shift_5_4_3_2_1_0(instruction);
+    uint64_t shiftx_value = extract_shiftx_11_10_9_8_7_6(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rt = GPR(copy(rt_value));
     std::string rs = GPR(copy(rs_value));
@@ -6847,11 +6847,11 @@ std::string NMD::DROTX(uint64 instruction)
  *          rs -----
  *                       shift -----
  */
-std::string NMD::DSLL(uint64 instruction)
+std::string NMD::DSLL(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 shift_value = extract_shift_4_3_2_1_0(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t shift_value = extract_shift_4_3_2_1_0(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rt = GPR(copy(rt_value));
     std::string rs = GPR(copy(rs_value));
@@ -6871,11 +6871,11 @@ std::string NMD::DSLL(uint64 instruction)
  *          rs -----
  *                       shift -----
  */
-std::string NMD::DSLL32(uint64 instruction)
+std::string NMD::DSLL32(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 shift_value = extract_shift_4_3_2_1_0(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t shift_value = extract_shift_4_3_2_1_0(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rt = GPR(copy(rt_value));
     std::string rs = GPR(copy(rs_value));
@@ -6895,11 +6895,11 @@ std::string NMD::DSLL32(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::DSLLV(uint64 instruction)
+std::string NMD::DSLLV(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 rd_value = extract_rd_20_19_18_17_16(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t rd_value = extract_rd_20_19_18_17_16(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rd = GPR(copy(rd_value));
     std::string rs = GPR(copy(rs_value));
@@ -6919,11 +6919,11 @@ std::string NMD::DSLLV(uint64 instruction)
  *          rs -----
  *                       shift -----
  */
-std::string NMD::DSRA(uint64 instruction)
+std::string NMD::DSRA(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 shift_value = extract_shift_4_3_2_1_0(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t shift_value = extract_shift_4_3_2_1_0(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rt = GPR(copy(rt_value));
     std::string rs = GPR(copy(rs_value));
@@ -6943,11 +6943,11 @@ std::string NMD::DSRA(uint64 instruction)
  *          rs -----
  *                       shift -----
  */
-std::string NMD::DSRA32(uint64 instruction)
+std::string NMD::DSRA32(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 shift_value = extract_shift_4_3_2_1_0(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t shift_value = extract_shift_4_3_2_1_0(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rt = GPR(copy(rt_value));
     std::string rs = GPR(copy(rs_value));
@@ -6967,11 +6967,11 @@ std::string NMD::DSRA32(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::DSRAV(uint64 instruction)
+std::string NMD::DSRAV(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 rd_value = extract_rd_20_19_18_17_16(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t rd_value = extract_rd_20_19_18_17_16(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rd = GPR(copy(rd_value));
     std::string rs = GPR(copy(rs_value));
@@ -6991,11 +6991,11 @@ std::string NMD::DSRAV(uint64 instruction)
  *          rs -----
  *                       shift -----
  */
-std::string NMD::DSRL(uint64 instruction)
+std::string NMD::DSRL(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 shift_value = extract_shift_4_3_2_1_0(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t shift_value = extract_shift_4_3_2_1_0(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rt = GPR(copy(rt_value));
     std::string rs = GPR(copy(rs_value));
@@ -7015,11 +7015,11 @@ std::string NMD::DSRL(uint64 instruction)
  *          rs -----
  *                       shift -----
  */
-std::string NMD::DSRL32(uint64 instruction)
+std::string NMD::DSRL32(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 shift_value = extract_shift_4_3_2_1_0(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t shift_value = extract_shift_4_3_2_1_0(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rt = GPR(copy(rt_value));
     std::string rs = GPR(copy(rs_value));
@@ -7039,11 +7039,11 @@ std::string NMD::DSRL32(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::DSRLV(uint64 instruction)
+std::string NMD::DSRLV(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 rd_value = extract_rd_20_19_18_17_16(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t rd_value = extract_rd_20_19_18_17_16(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rd = GPR(copy(rd_value));
     std::string rs = GPR(copy(rs_value));
@@ -7063,11 +7063,11 @@ std::string NMD::DSRLV(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::DSUB(uint64 instruction)
+std::string NMD::DSUB(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 rd_value = extract_rd_20_19_18_17_16(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t rd_value = extract_rd_20_19_18_17_16(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rd = GPR(copy(rd_value));
     std::string rs = GPR(copy(rs_value));
@@ -7087,11 +7087,11 @@ std::string NMD::DSUB(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::DSUBU(uint64 instruction)
+std::string NMD::DSUBU(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 rd_value = extract_rd_20_19_18_17_16(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t rd_value = extract_rd_20_19_18_17_16(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rd = GPR(copy(rd_value));
     std::string rs = GPR(copy(rs_value));
@@ -7111,9 +7111,9 @@ std::string NMD::DSUBU(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::DVPE(uint64 instruction)
+std::string NMD::DVPE(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
 
     std::string rt = GPR(copy(rt_value));
 
@@ -7131,9 +7131,9 @@ std::string NMD::DVPE(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::DVP(uint64 instruction)
+std::string NMD::DVP(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
 
     std::string rt = GPR(copy(rt_value));
 
@@ -7151,7 +7151,7 @@ std::string NMD::DVP(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::EHB(uint64 instruction)
+std::string NMD::EHB(uint64_t instruction)
 {
     (void)instruction;
 
@@ -7169,9 +7169,9 @@ std::string NMD::EHB(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::EI(uint64 instruction)
+std::string NMD::EI(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
 
     std::string rt = GPR(copy(rt_value));
 
@@ -7189,9 +7189,9 @@ std::string NMD::EI(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::EMT(uint64 instruction)
+std::string NMD::EMT(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
 
     std::string rt = GPR(copy(rt_value));
 
@@ -7209,7 +7209,7 @@ std::string NMD::EMT(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::ERET(uint64 instruction)
+std::string NMD::ERET(uint64_t instruction)
 {
     (void)instruction;
 
@@ -7227,7 +7227,7 @@ std::string NMD::ERET(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::ERETNC(uint64 instruction)
+std::string NMD::ERETNC(uint64_t instruction)
 {
     (void)instruction;
 
@@ -7245,9 +7245,9 @@ std::string NMD::ERETNC(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::EVP(uint64 instruction)
+std::string NMD::EVP(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
 
     std::string rt = GPR(copy(rt_value));
 
@@ -7265,9 +7265,9 @@ std::string NMD::EVP(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::EVPE(uint64 instruction)
+std::string NMD::EVPE(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
 
     std::string rt = GPR(copy(rt_value));
 
@@ -7285,12 +7285,12 @@ std::string NMD::EVPE(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::EXT(uint64 instruction)
+std::string NMD::EXT(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 msbd_value = extract_msbt_10_9_8_7_6(instruction);
-    uint64 lsb_value = extract_lsb_4_3_2_1_0(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t msbd_value = extract_msbt_10_9_8_7_6(instruction);
+    uint64_t lsb_value = extract_lsb_4_3_2_1_0(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rt = GPR(copy(rt_value));
     std::string rs = GPR(copy(rs_value));
@@ -7311,12 +7311,12 @@ std::string NMD::EXT(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::EXTD(uint64 instruction)
+std::string NMD::EXTD(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 shift_value = extract_shift_10_9_8_7_6(instruction);
-    uint64 rd_value = extract_rd_20_19_18_17_16(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t shift_value = extract_shift_10_9_8_7_6(instruction);
+    uint64_t rd_value = extract_rd_20_19_18_17_16(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rd = GPR(copy(rd_value));
     std::string rs = GPR(copy(rs_value));
@@ -7337,12 +7337,12 @@ std::string NMD::EXTD(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::EXTD32(uint64 instruction)
+std::string NMD::EXTD32(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 shift_value = extract_shift_10_9_8_7_6(instruction);
-    uint64 rd_value = extract_rd_20_19_18_17_16(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t shift_value = extract_shift_10_9_8_7_6(instruction);
+    uint64_t rd_value = extract_rd_20_19_18_17_16(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rd = GPR(copy(rd_value));
     std::string rs = GPR(copy(rs_value));
@@ -7363,11 +7363,11 @@ std::string NMD::EXTD32(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::EXTPDP(uint64 instruction)
+std::string NMD::EXTPDP(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 ac_value = extract_ac_13_12(instruction);
-    uint64 size_value = extract_size_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t ac_value = extract_ac_13_12(instruction);
+    uint64_t size_value = extract_size_20_19_18_17_16(instruction);
 
     std::string rt = GPR(copy(rt_value));
     std::string ac = AC(copy(ac_value));
@@ -7387,11 +7387,11 @@ std::string NMD::EXTPDP(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::EXTPDPV(uint64 instruction)
+std::string NMD::EXTPDPV(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 ac_value = extract_ac_13_12(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t ac_value = extract_ac_13_12(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rt = GPR(copy(rt_value));
     std::string ac = AC(copy(ac_value));
@@ -7411,11 +7411,11 @@ std::string NMD::EXTPDPV(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::EXTP(uint64 instruction)
+std::string NMD::EXTP(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 ac_value = extract_ac_13_12(instruction);
-    uint64 size_value = extract_size_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t ac_value = extract_ac_13_12(instruction);
+    uint64_t size_value = extract_size_20_19_18_17_16(instruction);
 
     std::string rt = GPR(copy(rt_value));
     std::string ac = AC(copy(ac_value));
@@ -7435,11 +7435,11 @@ std::string NMD::EXTP(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::EXTPV(uint64 instruction)
+std::string NMD::EXTPV(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 ac_value = extract_ac_13_12(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t ac_value = extract_ac_13_12(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rt = GPR(copy(rt_value));
     std::string ac = AC(copy(ac_value));
@@ -7459,11 +7459,11 @@ std::string NMD::EXTPV(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::EXTR_RS_W(uint64 instruction)
+std::string NMD::EXTR_RS_W(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 shift_value = extract_shift_20_19_18_17_16(instruction);
-    uint64 ac_value = extract_ac_13_12(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t shift_value = extract_shift_20_19_18_17_16(instruction);
+    uint64_t ac_value = extract_ac_13_12(instruction);
 
     std::string rt = GPR(copy(rt_value));
     std::string ac = AC(copy(ac_value));
@@ -7483,11 +7483,11 @@ std::string NMD::EXTR_RS_W(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::EXTR_R_W(uint64 instruction)
+std::string NMD::EXTR_R_W(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 shift_value = extract_shift_20_19_18_17_16(instruction);
-    uint64 ac_value = extract_ac_13_12(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t shift_value = extract_shift_20_19_18_17_16(instruction);
+    uint64_t ac_value = extract_ac_13_12(instruction);
 
     std::string rt = GPR(copy(rt_value));
     std::string ac = AC(copy(ac_value));
@@ -7507,11 +7507,11 @@ std::string NMD::EXTR_R_W(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::EXTR_S_H(uint64 instruction)
+std::string NMD::EXTR_S_H(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 shift_value = extract_shift_20_19_18_17_16(instruction);
-    uint64 ac_value = extract_ac_13_12(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t shift_value = extract_shift_20_19_18_17_16(instruction);
+    uint64_t ac_value = extract_ac_13_12(instruction);
 
     std::string rt = GPR(copy(rt_value));
     std::string ac = AC(copy(ac_value));
@@ -7531,11 +7531,11 @@ std::string NMD::EXTR_S_H(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::EXTR_W(uint64 instruction)
+std::string NMD::EXTR_W(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 shift_value = extract_shift_20_19_18_17_16(instruction);
-    uint64 ac_value = extract_ac_13_12(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t shift_value = extract_shift_20_19_18_17_16(instruction);
+    uint64_t ac_value = extract_ac_13_12(instruction);
 
     std::string rt = GPR(copy(rt_value));
     std::string ac = AC(copy(ac_value));
@@ -7555,11 +7555,11 @@ std::string NMD::EXTR_W(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::EXTRV_RS_W(uint64 instruction)
+std::string NMD::EXTRV_RS_W(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 ac_value = extract_ac_13_12(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t ac_value = extract_ac_13_12(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rt = GPR(copy(rt_value));
     std::string ac = AC(copy(ac_value));
@@ -7579,11 +7579,11 @@ std::string NMD::EXTRV_RS_W(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::EXTRV_R_W(uint64 instruction)
+std::string NMD::EXTRV_R_W(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 ac_value = extract_ac_13_12(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t ac_value = extract_ac_13_12(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rt = GPR(copy(rt_value));
     std::string ac = AC(copy(ac_value));
@@ -7603,11 +7603,11 @@ std::string NMD::EXTRV_R_W(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::EXTRV_S_H(uint64 instruction)
+std::string NMD::EXTRV_S_H(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 ac_value = extract_ac_13_12(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t ac_value = extract_ac_13_12(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rt = GPR(copy(rt_value));
     std::string ac = AC(copy(ac_value));
@@ -7627,11 +7627,11 @@ std::string NMD::EXTRV_S_H(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::EXTRV_W(uint64 instruction)
+std::string NMD::EXTRV_W(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 ac_value = extract_ac_13_12(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t ac_value = extract_ac_13_12(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rt = GPR(copy(rt_value));
     std::string ac = AC(copy(ac_value));
@@ -7652,12 +7652,12 @@ std::string NMD::EXTRV_W(uint64 instruction)
  *               rd -----
  *                 shift -----
  */
-std::string NMD::EXTW(uint64 instruction)
+std::string NMD::EXTW(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 shift_value = extract_shift_10_9_8_7_6(instruction);
-    uint64 rd_value = extract_rd_20_19_18_17_16(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t shift_value = extract_shift_10_9_8_7_6(instruction);
+    uint64_t rd_value = extract_rd_20_19_18_17_16(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rd = GPR(copy(rd_value));
     std::string rs = GPR(copy(rs_value));
@@ -7678,10 +7678,10 @@ std::string NMD::EXTW(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::FLOOR_L_D(uint64 instruction)
+std::string NMD::FLOOR_L_D(uint64_t instruction)
 {
-    uint64 fs_value = extract_fs_15_14_13_12_11(instruction);
-    uint64 ft_value = extract_ft_20_19_18_17_16(instruction);
+    uint64_t fs_value = extract_fs_15_14_13_12_11(instruction);
+    uint64_t ft_value = extract_ft_20_19_18_17_16(instruction);
 
     std::string ft = FPR(copy(ft_value));
     std::string fs = FPR(copy(fs_value));
@@ -7700,10 +7700,10 @@ std::string NMD::FLOOR_L_D(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::FLOOR_L_S(uint64 instruction)
+std::string NMD::FLOOR_L_S(uint64_t instruction)
 {
-    uint64 fs_value = extract_fs_15_14_13_12_11(instruction);
-    uint64 ft_value = extract_ft_20_19_18_17_16(instruction);
+    uint64_t fs_value = extract_fs_15_14_13_12_11(instruction);
+    uint64_t ft_value = extract_ft_20_19_18_17_16(instruction);
 
     std::string ft = FPR(copy(ft_value));
     std::string fs = FPR(copy(fs_value));
@@ -7722,10 +7722,10 @@ std::string NMD::FLOOR_L_S(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::FLOOR_W_D(uint64 instruction)
+std::string NMD::FLOOR_W_D(uint64_t instruction)
 {
-    uint64 fs_value = extract_fs_15_14_13_12_11(instruction);
-    uint64 ft_value = extract_ft_20_19_18_17_16(instruction);
+    uint64_t fs_value = extract_fs_15_14_13_12_11(instruction);
+    uint64_t ft_value = extract_ft_20_19_18_17_16(instruction);
 
     std::string ft = FPR(copy(ft_value));
     std::string fs = FPR(copy(fs_value));
@@ -7744,10 +7744,10 @@ std::string NMD::FLOOR_W_D(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::FLOOR_W_S(uint64 instruction)
+std::string NMD::FLOOR_W_S(uint64_t instruction)
 {
-    uint64 fs_value = extract_fs_15_14_13_12_11(instruction);
-    uint64 ft_value = extract_ft_20_19_18_17_16(instruction);
+    uint64_t fs_value = extract_fs_15_14_13_12_11(instruction);
+    uint64_t ft_value = extract_ft_20_19_18_17_16(instruction);
 
     std::string ft = FPR(copy(ft_value));
     std::string fs = FPR(copy(fs_value));
@@ -7766,11 +7766,11 @@ std::string NMD::FLOOR_W_S(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::FORK(uint64 instruction)
+std::string NMD::FORK(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 rd_value = extract_rd_20_19_18_17_16(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t rd_value = extract_rd_20_19_18_17_16(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rd = GPR(copy(rd_value));
     std::string rs = GPR(copy(rs_value));
@@ -7790,9 +7790,9 @@ std::string NMD::FORK(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::HYPCALL(uint64 instruction)
+std::string NMD::HYPCALL(uint64_t instruction)
 {
-    uint64 code_value = extract_code_17_to_0(instruction);
+    uint64_t code_value = extract_code_17_to_0(instruction);
 
     std::string code = IMMEDIATE(copy(code_value));
 
@@ -7810,9 +7810,9 @@ std::string NMD::HYPCALL(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::HYPCALL_16_(uint64 instruction)
+std::string NMD::HYPCALL_16_(uint64_t instruction)
 {
-    uint64 code_value = extract_code_1_0(instruction);
+    uint64_t code_value = extract_code_1_0(instruction);
 
     std::string code = IMMEDIATE(copy(code_value));
 
@@ -7830,12 +7830,12 @@ std::string NMD::HYPCALL_16_(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::INS(uint64 instruction)
+std::string NMD::INS(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 msbd_value = extract_msbt_10_9_8_7_6(instruction);
-    uint64 lsb_value = extract_lsb_4_3_2_1_0(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t msbd_value = extract_msbt_10_9_8_7_6(instruction);
+    uint64_t lsb_value = extract_lsb_4_3_2_1_0(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rt = GPR(copy(rt_value));
     std::string rs = GPR(copy(rs_value));
@@ -7858,10 +7858,10 @@ std::string NMD::INS(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::INSV(uint64 instruction)
+std::string NMD::INSV(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rt = GPR(copy(rt_value));
     std::string rs = GPR(copy(rs_value));
@@ -7880,7 +7880,7 @@ std::string NMD::INSV(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::IRET(uint64 instruction)
+std::string NMD::IRET(uint64_t instruction)
 {
     (void)instruction;
 
@@ -7898,9 +7898,9 @@ std::string NMD::IRET(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::JALRC_16_(uint64 instruction)
+std::string NMD::JALRC_16_(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_9_8_7_6_5(instruction);
+    uint64_t rt_value = extract_rt_9_8_7_6_5(instruction);
 
     std::string rt = GPR(copy(rt_value));
 
@@ -7918,10 +7918,10 @@ std::string NMD::JALRC_16_(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::JALRC_32_(uint64 instruction)
+std::string NMD::JALRC_32_(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rt = GPR(copy(rt_value));
     std::string rs = GPR(copy(rs_value));
@@ -7940,10 +7940,10 @@ std::string NMD::JALRC_32_(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::JALRC_HB(uint64 instruction)
+std::string NMD::JALRC_HB(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rt = GPR(copy(rt_value));
     std::string rs = GPR(copy(rs_value));
@@ -7962,9 +7962,9 @@ std::string NMD::JALRC_HB(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::JRC(uint64 instruction)
+std::string NMD::JRC(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_9_8_7_6_5(instruction);
+    uint64_t rt_value = extract_rt_9_8_7_6_5(instruction);
 
     std::string rt = GPR(copy(rt_value));
 
@@ -7982,11 +7982,11 @@ std::string NMD::JRC(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::LB_16_(uint64 instruction)
+std::string NMD::LB_16_(uint64_t instruction)
 {
-    uint64 u_value = extract_u_1_0(instruction);
-    uint64 rt3_value = extract_rt3_9_8_7(instruction);
-    uint64 rs3_value = extract_rs3_6_5_4(instruction);
+    uint64_t u_value = extract_u_1_0(instruction);
+    uint64_t rt3_value = extract_rt3_9_8_7(instruction);
+    uint64_t rs3_value = extract_rs3_6_5_4(instruction);
 
     std::string rt3 = GPR(encode_gpr3(rt3_value));
     std::string u = IMMEDIATE(copy(u_value));
@@ -8006,10 +8006,10 @@ std::string NMD::LB_16_(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::LB_GP_(uint64 instruction)
+std::string NMD::LB_GP_(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 u_value = extract_u_17_to_0(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t u_value = extract_u_17_to_0(instruction);
 
     std::string rt = GPR(copy(rt_value));
     std::string u = IMMEDIATE(copy(u_value));
@@ -8028,11 +8028,11 @@ std::string NMD::LB_GP_(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::LB_S9_(uint64 instruction)
+std::string NMD::LB_S9_(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    int64 s_value = extr_sil0il0bs8_il15il8bs1Tmsb8(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    int64_t s_value = extr_sil0il0bs8_il15il8bs1Tmsb8(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rt = GPR(copy(rt_value));
     std::string s = IMMEDIATE(copy(s_value));
@@ -8052,11 +8052,11 @@ std::string NMD::LB_S9_(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::LB_U12_(uint64 instruction)
+std::string NMD::LB_U12_(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 u_value = extract_u_11_10_9_8_7_6_5_4_3_2_1_0(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t u_value = extract_u_11_10_9_8_7_6_5_4_3_2_1_0(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rt = GPR(copy(rt_value));
     std::string u = IMMEDIATE(copy(u_value));
@@ -8076,11 +8076,11 @@ std::string NMD::LB_U12_(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::LBE(uint64 instruction)
+std::string NMD::LBE(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    int64 s_value = extr_sil0il0bs8_il15il8bs1Tmsb8(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    int64_t s_value = extr_sil0il0bs8_il15il8bs1Tmsb8(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rt = GPR(copy(rt_value));
     std::string s = IMMEDIATE(copy(s_value));
@@ -8100,11 +8100,11 @@ std::string NMD::LBE(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::LBU_16_(uint64 instruction)
+std::string NMD::LBU_16_(uint64_t instruction)
 {
-    uint64 u_value = extract_u_1_0(instruction);
-    uint64 rt3_value = extract_rt3_9_8_7(instruction);
-    uint64 rs3_value = extract_rs3_6_5_4(instruction);
+    uint64_t u_value = extract_u_1_0(instruction);
+    uint64_t rt3_value = extract_rt3_9_8_7(instruction);
+    uint64_t rs3_value = extract_rs3_6_5_4(instruction);
 
     std::string rt3 = GPR(encode_gpr3(rt3_value));
     std::string u = IMMEDIATE(copy(u_value));
@@ -8124,10 +8124,10 @@ std::string NMD::LBU_16_(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::LBU_GP_(uint64 instruction)
+std::string NMD::LBU_GP_(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 u_value = extract_u_17_to_0(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t u_value = extract_u_17_to_0(instruction);
 
     std::string rt = GPR(copy(rt_value));
     std::string u = IMMEDIATE(copy(u_value));
@@ -8146,11 +8146,11 @@ std::string NMD::LBU_GP_(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::LBU_S9_(uint64 instruction)
+std::string NMD::LBU_S9_(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    int64 s_value = extr_sil0il0bs8_il15il8bs1Tmsb8(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    int64_t s_value = extr_sil0il0bs8_il15il8bs1Tmsb8(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rt = GPR(copy(rt_value));
     std::string s = IMMEDIATE(copy(s_value));
@@ -8170,11 +8170,11 @@ std::string NMD::LBU_S9_(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::LBU_U12_(uint64 instruction)
+std::string NMD::LBU_U12_(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 u_value = extract_u_11_10_9_8_7_6_5_4_3_2_1_0(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t u_value = extract_u_11_10_9_8_7_6_5_4_3_2_1_0(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rt = GPR(copy(rt_value));
     std::string u = IMMEDIATE(copy(u_value));
@@ -8194,11 +8194,11 @@ std::string NMD::LBU_U12_(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::LBUE(uint64 instruction)
+std::string NMD::LBUE(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    int64 s_value = extr_sil0il0bs8_il15il8bs1Tmsb8(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    int64_t s_value = extr_sil0il0bs8_il15il8bs1Tmsb8(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rt = GPR(copy(rt_value));
     std::string s = IMMEDIATE(copy(s_value));
@@ -8218,11 +8218,11 @@ std::string NMD::LBUE(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::LBUX(uint64 instruction)
+std::string NMD::LBUX(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 rd_value = extract_rd_20_19_18_17_16(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t rd_value = extract_rd_20_19_18_17_16(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rd = GPR(copy(rd_value));
     std::string rs = GPR(copy(rs_value));
@@ -8242,11 +8242,11 @@ std::string NMD::LBUX(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::LBX(uint64 instruction)
+std::string NMD::LBX(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 rd_value = extract_rd_20_19_18_17_16(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t rd_value = extract_rd_20_19_18_17_16(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rd = GPR(copy(rd_value));
     std::string rs = GPR(copy(rs_value));
@@ -8266,10 +8266,10 @@ std::string NMD::LBX(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::LD_GP_(uint64 instruction)
+std::string NMD::LD_GP_(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 u_value = extr_uil3il3bs18Fmsb20(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t u_value = extr_uil3il3bs18Fmsb20(instruction);
 
     std::string rt = GPR(copy(rt_value));
     std::string u = IMMEDIATE(copy(u_value));
@@ -8288,11 +8288,11 @@ std::string NMD::LD_GP_(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::LD_S9_(uint64 instruction)
+std::string NMD::LD_S9_(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    int64 s_value = extr_sil0il0bs8_il15il8bs1Tmsb8(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    int64_t s_value = extr_sil0il0bs8_il15il8bs1Tmsb8(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rt = GPR(copy(rt_value));
     std::string s = IMMEDIATE(copy(s_value));
@@ -8312,11 +8312,11 @@ std::string NMD::LD_S9_(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::LD_U12_(uint64 instruction)
+std::string NMD::LD_U12_(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 u_value = extract_u_11_10_9_8_7_6_5_4_3_2_1_0(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t u_value = extract_u_11_10_9_8_7_6_5_4_3_2_1_0(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rt = GPR(copy(rt_value));
     std::string u = IMMEDIATE(copy(u_value));
@@ -8336,10 +8336,10 @@ std::string NMD::LD_U12_(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::LDC1_GP_(uint64 instruction)
+std::string NMD::LDC1_GP_(uint64_t instruction)
 {
-    uint64 ft_value = extract_ft_20_19_18_17_16(instruction);
-    uint64 u_value = extr_uil2il2bs16Fmsb17(instruction);
+    uint64_t ft_value = extract_ft_20_19_18_17_16(instruction);
+    uint64_t u_value = extr_uil2il2bs16Fmsb17(instruction);
 
     std::string ft = FPR(copy(ft_value));
     std::string u = IMMEDIATE(copy(u_value));
@@ -8358,11 +8358,11 @@ std::string NMD::LDC1_GP_(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::LDC1_S9_(uint64 instruction)
+std::string NMD::LDC1_S9_(uint64_t instruction)
 {
-    int64 s_value = extr_sil0il0bs8_il15il8bs1Tmsb8(instruction);
-    uint64 ft_value = extract_ft_20_19_18_17_16(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    int64_t s_value = extr_sil0il0bs8_il15il8bs1Tmsb8(instruction);
+    uint64_t ft_value = extract_ft_20_19_18_17_16(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string ft = FPR(copy(ft_value));
     std::string s = IMMEDIATE(copy(s_value));
@@ -8382,11 +8382,11 @@ std::string NMD::LDC1_S9_(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::LDC1_U12_(uint64 instruction)
+std::string NMD::LDC1_U12_(uint64_t instruction)
 {
-    uint64 ft_value = extract_ft_20_19_18_17_16(instruction);
-    uint64 u_value = extract_u_11_10_9_8_7_6_5_4_3_2_1_0(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t ft_value = extract_ft_20_19_18_17_16(instruction);
+    uint64_t u_value = extract_u_11_10_9_8_7_6_5_4_3_2_1_0(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string ft = FPR(copy(ft_value));
     std::string u = IMMEDIATE(copy(u_value));
@@ -8406,11 +8406,11 @@ std::string NMD::LDC1_U12_(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::LDC1XS(uint64 instruction)
+std::string NMD::LDC1XS(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 ft_value = extract_ft_15_14_13_12_11(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t ft_value = extract_ft_15_14_13_12_11(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string ft = FPR(copy(ft_value));
     std::string rs = GPR(copy(rs_value));
@@ -8430,11 +8430,11 @@ std::string NMD::LDC1XS(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::LDC1X(uint64 instruction)
+std::string NMD::LDC1X(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 ft_value = extract_ft_15_14_13_12_11(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t ft_value = extract_ft_15_14_13_12_11(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string ft = FPR(copy(ft_value));
     std::string rs = GPR(copy(rs_value));
@@ -8454,11 +8454,11 @@ std::string NMD::LDC1X(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::LDC2(uint64 instruction)
+std::string NMD::LDC2(uint64_t instruction)
 {
-    int64 s_value = extr_sil0il0bs8_il15il8bs1Tmsb8(instruction);
-    uint64 ct_value = extract_ct_25_24_23_22_21(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    int64_t s_value = extr_sil0il0bs8_il15il8bs1Tmsb8(instruction);
+    uint64_t ct_value = extract_ct_25_24_23_22_21(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string ct = CPR(copy(ct_value));
     std::string s = IMMEDIATE(copy(s_value));
@@ -8478,12 +8478,12 @@ std::string NMD::LDC2(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::LDM(uint64 instruction)
+std::string NMD::LDM(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 count3_value = extract_count3_14_13_12(instruction);
-    int64 s_value = extr_sil0il0bs8_il15il8bs1Tmsb8(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t count3_value = extract_count3_14_13_12(instruction);
+    int64_t s_value = extr_sil0il0bs8_il15il8bs1Tmsb8(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rt = GPR(copy(rt_value));
     std::string s = IMMEDIATE(copy(s_value));
@@ -8504,10 +8504,10 @@ std::string NMD::LDM(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::LDPC_48_(uint64 instruction)
+std::string NMD::LDPC_48_(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_41_40_39_38_37(instruction);
-    int64 s_value = extr_sil0il16bs16_il16il0bs16Tmsb31(instruction);
+    uint64_t rt_value = extract_rt_41_40_39_38_37(instruction);
+    int64_t s_value = extr_sil0il16bs16_il16il0bs16Tmsb31(instruction);
 
     std::string rt = GPR(copy(rt_value));
     std::string s = ADDRESS(encode_s_from_address(s_value), 6);
@@ -8526,11 +8526,11 @@ std::string NMD::LDPC_48_(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::LDX(uint64 instruction)
+std::string NMD::LDX(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 rd_value = extract_rd_20_19_18_17_16(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t rd_value = extract_rd_20_19_18_17_16(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rd = GPR(copy(rd_value));
     std::string rs = GPR(copy(rs_value));
@@ -8550,11 +8550,11 @@ std::string NMD::LDX(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::LDXS(uint64 instruction)
+std::string NMD::LDXS(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 rd_value = extract_rd_20_19_18_17_16(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t rd_value = extract_rd_20_19_18_17_16(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rd = GPR(copy(rd_value));
     std::string rs = GPR(copy(rs_value));
@@ -8574,11 +8574,11 @@ std::string NMD::LDXS(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::LH_16_(uint64 instruction)
+std::string NMD::LH_16_(uint64_t instruction)
 {
-    uint64 u_value = extr_uil1il1bs2Fmsb2(instruction);
-    uint64 rt3_value = extract_rt3_9_8_7(instruction);
-    uint64 rs3_value = extract_rs3_6_5_4(instruction);
+    uint64_t u_value = extr_uil1il1bs2Fmsb2(instruction);
+    uint64_t rt3_value = extract_rt3_9_8_7(instruction);
+    uint64_t rs3_value = extract_rs3_6_5_4(instruction);
 
     std::string rt3 = GPR(encode_gpr3(rt3_value));
     std::string u = IMMEDIATE(copy(u_value));
@@ -8598,10 +8598,10 @@ std::string NMD::LH_16_(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::LH_GP_(uint64 instruction)
+std::string NMD::LH_GP_(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 u_value = extr_uil1il1bs17Fmsb17(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t u_value = extr_uil1il1bs17Fmsb17(instruction);
 
     std::string rt = GPR(copy(rt_value));
     std::string u = IMMEDIATE(copy(u_value));
@@ -8620,11 +8620,11 @@ std::string NMD::LH_GP_(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::LH_S9_(uint64 instruction)
+std::string NMD::LH_S9_(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    int64 s_value = extr_sil0il0bs8_il15il8bs1Tmsb8(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    int64_t s_value = extr_sil0il0bs8_il15il8bs1Tmsb8(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rt = GPR(copy(rt_value));
     std::string s = IMMEDIATE(copy(s_value));
@@ -8644,11 +8644,11 @@ std::string NMD::LH_S9_(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::LH_U12_(uint64 instruction)
+std::string NMD::LH_U12_(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 u_value = extract_u_11_10_9_8_7_6_5_4_3_2_1_0(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t u_value = extract_u_11_10_9_8_7_6_5_4_3_2_1_0(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rt = GPR(copy(rt_value));
     std::string u = IMMEDIATE(copy(u_value));
@@ -8668,11 +8668,11 @@ std::string NMD::LH_U12_(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::LHE(uint64 instruction)
+std::string NMD::LHE(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    int64 s_value = extr_sil0il0bs8_il15il8bs1Tmsb8(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    int64_t s_value = extr_sil0il0bs8_il15il8bs1Tmsb8(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rt = GPR(copy(rt_value));
     std::string s = IMMEDIATE(copy(s_value));
@@ -8692,11 +8692,11 @@ std::string NMD::LHE(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::LHU_16_(uint64 instruction)
+std::string NMD::LHU_16_(uint64_t instruction)
 {
-    uint64 u_value = extr_uil1il1bs2Fmsb2(instruction);
-    uint64 rt3_value = extract_rt3_9_8_7(instruction);
-    uint64 rs3_value = extract_rs3_6_5_4(instruction);
+    uint64_t u_value = extr_uil1il1bs2Fmsb2(instruction);
+    uint64_t rt3_value = extract_rt3_9_8_7(instruction);
+    uint64_t rs3_value = extract_rs3_6_5_4(instruction);
 
     std::string rt3 = GPR(encode_gpr3(rt3_value));
     std::string u = IMMEDIATE(copy(u_value));
@@ -8716,10 +8716,10 @@ std::string NMD::LHU_16_(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::LHU_GP_(uint64 instruction)
+std::string NMD::LHU_GP_(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 u_value = extr_uil1il1bs17Fmsb17(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t u_value = extr_uil1il1bs17Fmsb17(instruction);
 
     std::string rt = GPR(copy(rt_value));
     std::string u = IMMEDIATE(copy(u_value));
@@ -8738,11 +8738,11 @@ std::string NMD::LHU_GP_(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::LHU_S9_(uint64 instruction)
+std::string NMD::LHU_S9_(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    int64 s_value = extr_sil0il0bs8_il15il8bs1Tmsb8(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    int64_t s_value = extr_sil0il0bs8_il15il8bs1Tmsb8(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rt = GPR(copy(rt_value));
     std::string s = IMMEDIATE(copy(s_value));
@@ -8762,11 +8762,11 @@ std::string NMD::LHU_S9_(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::LHU_U12_(uint64 instruction)
+std::string NMD::LHU_U12_(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 u_value = extract_u_11_10_9_8_7_6_5_4_3_2_1_0(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t u_value = extract_u_11_10_9_8_7_6_5_4_3_2_1_0(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rt = GPR(copy(rt_value));
     std::string u = IMMEDIATE(copy(u_value));
@@ -8786,11 +8786,11 @@ std::string NMD::LHU_U12_(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::LHUE(uint64 instruction)
+std::string NMD::LHUE(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    int64 s_value = extr_sil0il0bs8_il15il8bs1Tmsb8(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    int64_t s_value = extr_sil0il0bs8_il15il8bs1Tmsb8(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rt = GPR(copy(rt_value));
     std::string s = IMMEDIATE(copy(s_value));
@@ -8810,11 +8810,11 @@ std::string NMD::LHUE(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::LHUX(uint64 instruction)
+std::string NMD::LHUX(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 rd_value = extract_rd_20_19_18_17_16(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t rd_value = extract_rd_20_19_18_17_16(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rd = GPR(copy(rd_value));
     std::string rs = GPR(copy(rs_value));
@@ -8834,11 +8834,11 @@ std::string NMD::LHUX(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::LHUXS(uint64 instruction)
+std::string NMD::LHUXS(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 rd_value = extract_rd_20_19_18_17_16(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t rd_value = extract_rd_20_19_18_17_16(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rd = GPR(copy(rd_value));
     std::string rs = GPR(copy(rs_value));
@@ -8858,11 +8858,11 @@ std::string NMD::LHUXS(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::LHXS(uint64 instruction)
+std::string NMD::LHXS(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 rd_value = extract_rd_20_19_18_17_16(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t rd_value = extract_rd_20_19_18_17_16(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rd = GPR(copy(rd_value));
     std::string rs = GPR(copy(rs_value));
@@ -8882,11 +8882,11 @@ std::string NMD::LHXS(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::LHX(uint64 instruction)
+std::string NMD::LHX(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 rd_value = extract_rd_20_19_18_17_16(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t rd_value = extract_rd_20_19_18_17_16(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rd = GPR(copy(rd_value));
     std::string rs = GPR(copy(rs_value));
@@ -8906,10 +8906,10 @@ std::string NMD::LHX(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::LI_16_(uint64 instruction)
+std::string NMD::LI_16_(uint64_t instruction)
 {
-    uint64 eu_value = extract_eu_6_5_4_3_2_1_0(instruction);
-    uint64 rt3_value = extract_rt3_9_8_7(instruction);
+    uint64_t eu_value = extract_eu_6_5_4_3_2_1_0(instruction);
+    uint64_t rt3_value = extract_rt3_9_8_7(instruction);
 
     std::string rt3 = GPR(encode_gpr3(rt3_value));
     std::string eu = IMMEDIATE(encode_eu_from_s_li16(eu_value));
@@ -8928,10 +8928,10 @@ std::string NMD::LI_16_(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::LI_48_(uint64 instruction)
+std::string NMD::LI_48_(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_41_40_39_38_37(instruction);
-    int64 s_value = extr_sil0il16bs16_il16il0bs16Tmsb31(instruction);
+    uint64_t rt_value = extract_rt_41_40_39_38_37(instruction);
+    int64_t s_value = extr_sil0il16bs16_il16il0bs16Tmsb31(instruction);
 
     std::string rt = GPR(copy(rt_value));
     std::string s = IMMEDIATE(copy(s_value));
@@ -8950,11 +8950,11 @@ std::string NMD::LI_48_(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::LL(uint64 instruction)
+std::string NMD::LL(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    int64 s_value = extr_sil2il2bs6_il15il8bs1Tmsb8(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    int64_t s_value = extr_sil2il2bs6_il15il8bs1Tmsb8(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rt = GPR(copy(rt_value));
     std::string s = IMMEDIATE(copy(s_value));
@@ -8974,11 +8974,11 @@ std::string NMD::LL(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::LLD(uint64 instruction)
+std::string NMD::LLD(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    int64 s_value = extr_sil3il3bs5_il15il8bs1Tmsb8(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    int64_t s_value = extr_sil3il3bs5_il15il8bs1Tmsb8(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rt = GPR(copy(rt_value));
     std::string s = IMMEDIATE(copy(s_value));
@@ -8998,11 +8998,11 @@ std::string NMD::LLD(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::LLDP(uint64 instruction)
+std::string NMD::LLDP(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 ru_value = extract_ru_7_6_5_4_3(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t ru_value = extract_ru_7_6_5_4_3(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rt = GPR(copy(rt_value));
     std::string ru = GPR(copy(ru_value));
@@ -9022,11 +9022,11 @@ std::string NMD::LLDP(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::LLE(uint64 instruction)
+std::string NMD::LLE(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    int64 s_value = extr_sil2il2bs6_il15il8bs1Tmsb8(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    int64_t s_value = extr_sil2il2bs6_il15il8bs1Tmsb8(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rt = GPR(copy(rt_value));
     std::string s = IMMEDIATE(copy(s_value));
@@ -9046,11 +9046,11 @@ std::string NMD::LLE(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::LLWP(uint64 instruction)
+std::string NMD::LLWP(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 ru_value = extract_ru_7_6_5_4_3(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t ru_value = extract_ru_7_6_5_4_3(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rt = GPR(copy(rt_value));
     std::string ru = GPR(copy(ru_value));
@@ -9070,11 +9070,11 @@ std::string NMD::LLWP(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::LLWPE(uint64 instruction)
+std::string NMD::LLWPE(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 ru_value = extract_ru_7_6_5_4_3(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t ru_value = extract_ru_7_6_5_4_3(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rt = GPR(copy(rt_value));
     std::string ru = GPR(copy(ru_value));
@@ -9094,12 +9094,12 @@ std::string NMD::LLWPE(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::LSA(uint64 instruction)
+std::string NMD::LSA(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 rd_value = extract_rd_20_19_18_17_16(instruction);
-    uint64 u2_value = extract_u2_10_9(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t rd_value = extract_rd_20_19_18_17_16(instruction);
+    uint64_t u2_value = extract_u2_10_9(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rd = GPR(copy(rd_value));
     std::string rs = GPR(copy(rs_value));
@@ -9120,10 +9120,10 @@ std::string NMD::LSA(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::LUI(uint64 instruction)
+std::string NMD::LUI(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    int64 s_value = 
extr_sil0il31bs1_il2il21bs10_il12il12bs9Tmsb31(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    int64_t s_value = 
extr_sil0il31bs1_il2il21bs10_il12il12bs9Tmsb31(instruction);
 
     std::string rt = GPR(copy(rt_value));
     std::string s = IMMEDIATE(copy(s_value));
@@ -9142,11 +9142,11 @@ std::string NMD::LUI(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::LW_16_(uint64 instruction)
+std::string NMD::LW_16_(uint64_t instruction)
 {
-    uint64 u_value = extr_uil0il2bs4Fmsb5(instruction);
-    uint64 rt3_value = extract_rt3_9_8_7(instruction);
-    uint64 rs3_value = extract_rs3_6_5_4(instruction);
+    uint64_t u_value = extr_uil0il2bs4Fmsb5(instruction);
+    uint64_t rt3_value = extract_rt3_9_8_7(instruction);
+    uint64_t rs3_value = extract_rs3_6_5_4(instruction);
 
     std::string rt3 = GPR(encode_gpr3(rt3_value));
     std::string u = IMMEDIATE(copy(u_value));
@@ -9166,11 +9166,11 @@ std::string NMD::LW_16_(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::LW_4X4_(uint64 instruction)
+std::string NMD::LW_4X4_(uint64_t instruction)
 {
-    uint64 rs4_value = extract_rs4_4_2_1_0(instruction);
-    uint64 rt4_value = extract_rt4_9_7_6_5(instruction);
-    uint64 u_value = extr_uil3il3bs1_il8il2bs1Fmsb3(instruction);
+    uint64_t rs4_value = extract_rs4_4_2_1_0(instruction);
+    uint64_t rt4_value = extract_rt4_9_7_6_5(instruction);
+    uint64_t u_value = extr_uil3il3bs1_il8il2bs1Fmsb3(instruction);
 
     std::string rt4 = GPR(encode_gpr4(rt4_value));
     std::string u = IMMEDIATE(copy(u_value));
@@ -9190,10 +9190,10 @@ std::string NMD::LW_4X4_(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::LW_GP_(uint64 instruction)
+std::string NMD::LW_GP_(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 u_value = extr_uil2il2bs19Fmsb20(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t u_value = extr_uil2il2bs19Fmsb20(instruction);
 
     std::string rt = GPR(copy(rt_value));
     std::string u = IMMEDIATE(copy(u_value));
@@ -9212,10 +9212,10 @@ std::string NMD::LW_GP_(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::LW_GP16_(uint64 instruction)
+std::string NMD::LW_GP16_(uint64_t instruction)
 {
-    uint64 u_value = extr_uil0il2bs7Fmsb8(instruction);
-    uint64 rt3_value = extract_rt3_9_8_7(instruction);
+    uint64_t u_value = extr_uil0il2bs7Fmsb8(instruction);
+    uint64_t rt3_value = extract_rt3_9_8_7(instruction);
 
     std::string rt3 = GPR(encode_gpr3(rt3_value));
     std::string u = IMMEDIATE(copy(u_value));
@@ -9234,11 +9234,11 @@ std::string NMD::LW_GP16_(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::LW_S9_(uint64 instruction)
+std::string NMD::LW_S9_(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    int64 s_value = extr_sil0il0bs8_il15il8bs1Tmsb8(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    int64_t s_value = extr_sil0il0bs8_il15il8bs1Tmsb8(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rt = GPR(copy(rt_value));
     std::string s = IMMEDIATE(copy(s_value));
@@ -9258,10 +9258,10 @@ std::string NMD::LW_S9_(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::LW_SP_(uint64 instruction)
+std::string NMD::LW_SP_(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_9_8_7_6_5(instruction);
-    uint64 u_value = extr_uil0il2bs5Fmsb6(instruction);
+    uint64_t rt_value = extract_rt_9_8_7_6_5(instruction);
+    uint64_t u_value = extr_uil0il2bs5Fmsb6(instruction);
 
     std::string rt = GPR(copy(rt_value));
     std::string u = IMMEDIATE(copy(u_value));
@@ -9280,11 +9280,11 @@ std::string NMD::LW_SP_(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::LW_U12_(uint64 instruction)
+std::string NMD::LW_U12_(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 u_value = extract_u_11_10_9_8_7_6_5_4_3_2_1_0(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t u_value = extract_u_11_10_9_8_7_6_5_4_3_2_1_0(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rt = GPR(copy(rt_value));
     std::string u = IMMEDIATE(copy(u_value));
@@ -9304,10 +9304,10 @@ std::string NMD::LW_U12_(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::LWC1_GP_(uint64 instruction)
+std::string NMD::LWC1_GP_(uint64_t instruction)
 {
-    uint64 ft_value = extract_ft_20_19_18_17_16(instruction);
-    uint64 u_value = extr_uil2il2bs16Fmsb17(instruction);
+    uint64_t ft_value = extract_ft_20_19_18_17_16(instruction);
+    uint64_t u_value = extr_uil2il2bs16Fmsb17(instruction);
 
     std::string ft = FPR(copy(ft_value));
     std::string u = IMMEDIATE(copy(u_value));
@@ -9326,11 +9326,11 @@ std::string NMD::LWC1_GP_(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::LWC1_S9_(uint64 instruction)
+std::string NMD::LWC1_S9_(uint64_t instruction)
 {
-    int64 s_value = extr_sil0il0bs8_il15il8bs1Tmsb8(instruction);
-    uint64 ft_value = extract_ft_20_19_18_17_16(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    int64_t s_value = extr_sil0il0bs8_il15il8bs1Tmsb8(instruction);
+    uint64_t ft_value = extract_ft_20_19_18_17_16(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string ft = FPR(copy(ft_value));
     std::string s = IMMEDIATE(copy(s_value));
@@ -9350,11 +9350,11 @@ std::string NMD::LWC1_S9_(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::LWC1_U12_(uint64 instruction)
+std::string NMD::LWC1_U12_(uint64_t instruction)
 {
-    uint64 ft_value = extract_ft_20_19_18_17_16(instruction);
-    uint64 u_value = extract_u_11_10_9_8_7_6_5_4_3_2_1_0(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t ft_value = extract_ft_20_19_18_17_16(instruction);
+    uint64_t u_value = extract_u_11_10_9_8_7_6_5_4_3_2_1_0(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string ft = FPR(copy(ft_value));
     std::string u = IMMEDIATE(copy(u_value));
@@ -9374,11 +9374,11 @@ std::string NMD::LWC1_U12_(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::LWC1X(uint64 instruction)
+std::string NMD::LWC1X(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 ft_value = extract_ft_15_14_13_12_11(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t ft_value = extract_ft_15_14_13_12_11(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string ft = FPR(copy(ft_value));
     std::string rs = GPR(copy(rs_value));
@@ -9398,11 +9398,11 @@ std::string NMD::LWC1X(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::LWC1XS(uint64 instruction)
+std::string NMD::LWC1XS(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 ft_value = extract_ft_15_14_13_12_11(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t ft_value = extract_ft_15_14_13_12_11(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string ft = FPR(copy(ft_value));
     std::string rs = GPR(copy(rs_value));
@@ -9422,11 +9422,11 @@ std::string NMD::LWC1XS(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::LWC2(uint64 instruction)
+std::string NMD::LWC2(uint64_t instruction)
 {
-    int64 s_value = extr_sil0il0bs8_il15il8bs1Tmsb8(instruction);
-    uint64 ct_value = extract_ct_25_24_23_22_21(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    int64_t s_value = extr_sil0il0bs8_il15il8bs1Tmsb8(instruction);
+    uint64_t ct_value = extract_ct_25_24_23_22_21(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string ct = CPR(copy(ct_value));
     std::string s = IMMEDIATE(copy(s_value));
@@ -9446,11 +9446,11 @@ std::string NMD::LWC2(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::LWE(uint64 instruction)
+std::string NMD::LWE(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    int64 s_value = extr_sil0il0bs8_il15il8bs1Tmsb8(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    int64_t s_value = extr_sil0il0bs8_il15il8bs1Tmsb8(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rt = GPR(copy(rt_value));
     std::string s = IMMEDIATE(copy(s_value));
@@ -9470,12 +9470,12 @@ std::string NMD::LWE(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::LWM(uint64 instruction)
+std::string NMD::LWM(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 count3_value = extract_count3_14_13_12(instruction);
-    int64 s_value = extr_sil0il0bs8_il15il8bs1Tmsb8(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t count3_value = extract_count3_14_13_12(instruction);
+    int64_t s_value = extr_sil0il0bs8_il15il8bs1Tmsb8(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rt = GPR(copy(rt_value));
     std::string s = IMMEDIATE(copy(s_value));
@@ -9496,10 +9496,10 @@ std::string NMD::LWM(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::LWPC_48_(uint64 instruction)
+std::string NMD::LWPC_48_(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_41_40_39_38_37(instruction);
-    int64 s_value = extr_sil0il16bs16_il16il0bs16Tmsb31(instruction);
+    uint64_t rt_value = extract_rt_41_40_39_38_37(instruction);
+    int64_t s_value = extr_sil0il16bs16_il16il0bs16Tmsb31(instruction);
 
     std::string rt = GPR(copy(rt_value));
     std::string s = ADDRESS(encode_s_from_address(s_value), 6);
@@ -9518,10 +9518,10 @@ std::string NMD::LWPC_48_(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::LWU_GP_(uint64 instruction)
+std::string NMD::LWU_GP_(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 u_value = extr_uil2il2bs16Fmsb17(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t u_value = extr_uil2il2bs16Fmsb17(instruction);
 
     std::string rt = GPR(copy(rt_value));
     std::string u = IMMEDIATE(copy(u_value));
@@ -9540,11 +9540,11 @@ std::string NMD::LWU_GP_(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::LWU_S9_(uint64 instruction)
+std::string NMD::LWU_S9_(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    int64 s_value = extr_sil0il0bs8_il15il8bs1Tmsb8(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    int64_t s_value = extr_sil0il0bs8_il15il8bs1Tmsb8(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rt = GPR(copy(rt_value));
     std::string s = IMMEDIATE(copy(s_value));
@@ -9564,11 +9564,11 @@ std::string NMD::LWU_S9_(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::LWU_U12_(uint64 instruction)
+std::string NMD::LWU_U12_(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 u_value = extract_u_11_10_9_8_7_6_5_4_3_2_1_0(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t u_value = extract_u_11_10_9_8_7_6_5_4_3_2_1_0(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rt = GPR(copy(rt_value));
     std::string u = IMMEDIATE(copy(u_value));
@@ -9588,11 +9588,11 @@ std::string NMD::LWU_U12_(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::LWUX(uint64 instruction)
+std::string NMD::LWUX(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 rd_value = extract_rd_20_19_18_17_16(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t rd_value = extract_rd_20_19_18_17_16(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rd = GPR(copy(rd_value));
     std::string rs = GPR(copy(rs_value));
@@ -9612,11 +9612,11 @@ std::string NMD::LWUX(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::LWUXS(uint64 instruction)
+std::string NMD::LWUXS(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 rd_value = extract_rd_20_19_18_17_16(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t rd_value = extract_rd_20_19_18_17_16(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rd = GPR(copy(rd_value));
     std::string rs = GPR(copy(rs_value));
@@ -9636,11 +9636,11 @@ std::string NMD::LWUXS(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::LWX(uint64 instruction)
+std::string NMD::LWX(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 rd_value = extract_rd_20_19_18_17_16(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t rd_value = extract_rd_20_19_18_17_16(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rd = GPR(copy(rd_value));
     std::string rs = GPR(copy(rs_value));
@@ -9660,11 +9660,11 @@ std::string NMD::LWX(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::LWXS_16_(uint64 instruction)
+std::string NMD::LWXS_16_(uint64_t instruction)
 {
-    uint64 rd3_value = extract_rd3_3_2_1(instruction);
-    uint64 rt3_value = extract_rt3_9_8_7(instruction);
-    uint64 rs3_value = extract_rs3_6_5_4(instruction);
+    uint64_t rd3_value = extract_rd3_3_2_1(instruction);
+    uint64_t rt3_value = extract_rt3_9_8_7(instruction);
+    uint64_t rs3_value = extract_rs3_6_5_4(instruction);
 
     std::string rd3 = GPR(encode_gpr3(rd3_value));
     std::string rs3 = GPR(encode_gpr3(rs3_value));
@@ -9684,11 +9684,11 @@ std::string NMD::LWXS_16_(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::LWXS_32_(uint64 instruction)
+std::string NMD::LWXS_32_(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 rd_value = extract_rd_20_19_18_17_16(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t rd_value = extract_rd_20_19_18_17_16(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rd = GPR(copy(rd_value));
     std::string rs = GPR(copy(rs_value));
@@ -9708,11 +9708,11 @@ std::string NMD::LWXS_32_(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::MADD_DSP_(uint64 instruction)
+std::string NMD::MADD_DSP_(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 ac_value = extract_ac_13_12(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t ac_value = extract_ac_13_12(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string ac = AC(copy(ac_value));
     std::string rs = GPR(copy(rs_value));
@@ -9732,11 +9732,11 @@ std::string NMD::MADD_DSP_(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::MADDF_D(uint64 instruction)
+std::string NMD::MADDF_D(uint64_t instruction)
 {
-    uint64 fs_value = extract_fs_15_14_13_12_11(instruction);
-    uint64 ft_value = extract_ft_20_19_18_17_16(instruction);
-    uint64 fd_value = extract_fd_10_9_8_7_6(instruction);
+    uint64_t fs_value = extract_fs_15_14_13_12_11(instruction);
+    uint64_t ft_value = extract_ft_20_19_18_17_16(instruction);
+    uint64_t fd_value = extract_fd_10_9_8_7_6(instruction);
 
     std::string fd = FPR(copy(fd_value));
     std::string fs = FPR(copy(fs_value));
@@ -9756,11 +9756,11 @@ std::string NMD::MADDF_D(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::MADDF_S(uint64 instruction)
+std::string NMD::MADDF_S(uint64_t instruction)
 {
-    uint64 fs_value = extract_fs_15_14_13_12_11(instruction);
-    uint64 ft_value = extract_ft_20_19_18_17_16(instruction);
-    uint64 fd_value = extract_fd_10_9_8_7_6(instruction);
+    uint64_t fs_value = extract_fs_15_14_13_12_11(instruction);
+    uint64_t ft_value = extract_ft_20_19_18_17_16(instruction);
+    uint64_t fd_value = extract_fd_10_9_8_7_6(instruction);
 
     std::string fd = FPR(copy(fd_value));
     std::string fs = FPR(copy(fs_value));
@@ -9780,11 +9780,11 @@ std::string NMD::MADDF_S(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::MADDU_DSP_(uint64 instruction)
+std::string NMD::MADDU_DSP_(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 ac_value = extract_ac_13_12(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t ac_value = extract_ac_13_12(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string ac = AC(copy(ac_value));
     std::string rs = GPR(copy(rs_value));
@@ -9804,11 +9804,11 @@ std::string NMD::MADDU_DSP_(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::MAQ_S_W_PHL(uint64 instruction)
+std::string NMD::MAQ_S_W_PHL(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 ac_value = extract_ac_13_12(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t ac_value = extract_ac_13_12(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string ac = AC(copy(ac_value));
     std::string rs = GPR(copy(rs_value));
@@ -9828,11 +9828,11 @@ std::string NMD::MAQ_S_W_PHL(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::MAQ_S_W_PHR(uint64 instruction)
+std::string NMD::MAQ_S_W_PHR(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 ac_value = extract_ac_13_12(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t ac_value = extract_ac_13_12(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string ac = AC(copy(ac_value));
     std::string rs = GPR(copy(rs_value));
@@ -9852,11 +9852,11 @@ std::string NMD::MAQ_S_W_PHR(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::MAQ_SA_W_PHL(uint64 instruction)
+std::string NMD::MAQ_SA_W_PHL(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 ac_value = extract_ac_13_12(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t ac_value = extract_ac_13_12(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string ac = AC(copy(ac_value));
     std::string rs = GPR(copy(rs_value));
@@ -9876,11 +9876,11 @@ std::string NMD::MAQ_SA_W_PHL(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::MAQ_SA_W_PHR(uint64 instruction)
+std::string NMD::MAQ_SA_W_PHR(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 ac_value = extract_ac_13_12(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t ac_value = extract_ac_13_12(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string ac = AC(copy(ac_value));
     std::string rs = GPR(copy(rs_value));
@@ -9900,11 +9900,11 @@ std::string NMD::MAQ_SA_W_PHR(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::MAX_D(uint64 instruction)
+std::string NMD::MAX_D(uint64_t instruction)
 {
-    uint64 fs_value = extract_fs_15_14_13_12_11(instruction);
-    uint64 ft_value = extract_ft_20_19_18_17_16(instruction);
-    uint64 fd_value = extract_fd_10_9_8_7_6(instruction);
+    uint64_t fs_value = extract_fs_15_14_13_12_11(instruction);
+    uint64_t ft_value = extract_ft_20_19_18_17_16(instruction);
+    uint64_t fd_value = extract_fd_10_9_8_7_6(instruction);
 
     std::string fd = FPR(copy(fd_value));
     std::string fs = FPR(copy(fs_value));
@@ -9924,11 +9924,11 @@ std::string NMD::MAX_D(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::MAX_S(uint64 instruction)
+std::string NMD::MAX_S(uint64_t instruction)
 {
-    uint64 fs_value = extract_fs_15_14_13_12_11(instruction);
-    uint64 ft_value = extract_ft_20_19_18_17_16(instruction);
-    uint64 fd_value = extract_fd_10_9_8_7_6(instruction);
+    uint64_t fs_value = extract_fs_15_14_13_12_11(instruction);
+    uint64_t ft_value = extract_ft_20_19_18_17_16(instruction);
+    uint64_t fd_value = extract_fd_10_9_8_7_6(instruction);
 
     std::string fd = FPR(copy(fd_value));
     std::string fs = FPR(copy(fs_value));
@@ -9948,11 +9948,11 @@ std::string NMD::MAX_S(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::MAXA_D(uint64 instruction)
+std::string NMD::MAXA_D(uint64_t instruction)
 {
-    uint64 fs_value = extract_fs_15_14_13_12_11(instruction);
-    uint64 ft_value = extract_ft_20_19_18_17_16(instruction);
-    uint64 fd_value = extract_fd_10_9_8_7_6(instruction);
+    uint64_t fs_value = extract_fs_15_14_13_12_11(instruction);
+    uint64_t ft_value = extract_ft_20_19_18_17_16(instruction);
+    uint64_t fd_value = extract_fd_10_9_8_7_6(instruction);
 
     std::string fd = FPR(copy(fd_value));
     std::string fs = FPR(copy(fs_value));
@@ -9972,11 +9972,11 @@ std::string NMD::MAXA_D(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::MAXA_S(uint64 instruction)
+std::string NMD::MAXA_S(uint64_t instruction)
 {
-    uint64 fs_value = extract_fs_15_14_13_12_11(instruction);
-    uint64 ft_value = extract_ft_20_19_18_17_16(instruction);
-    uint64 fd_value = extract_fd_10_9_8_7_6(instruction);
+    uint64_t fs_value = extract_fs_15_14_13_12_11(instruction);
+    uint64_t ft_value = extract_ft_20_19_18_17_16(instruction);
+    uint64_t fd_value = extract_fd_10_9_8_7_6(instruction);
 
     std::string fd = FPR(copy(fd_value));
     std::string fs = FPR(copy(fs_value));
@@ -9996,11 +9996,11 @@ std::string NMD::MAXA_S(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::MFC0(uint64 instruction)
+std::string NMD::MFC0(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 c0s_value = extract_c0s_20_19_18_17_16(instruction);
-    uint64 sel_value = extract_sel_15_14_13_12_11(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t c0s_value = extract_c0s_20_19_18_17_16(instruction);
+    uint64_t sel_value = extract_sel_15_14_13_12_11(instruction);
 
     std::string rt = GPR(copy(rt_value));
     std::string c0s = CPR(copy(c0s_value));
@@ -10020,10 +10020,10 @@ std::string NMD::MFC0(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::MFC1(uint64 instruction)
+std::string NMD::MFC1(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 fs_value = extract_fs_15_14_13_12_11(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t fs_value = extract_fs_15_14_13_12_11(instruction);
 
     std::string rt = GPR(copy(rt_value));
     std::string fs = FPR(copy(fs_value));
@@ -10042,10 +10042,10 @@ std::string NMD::MFC1(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::MFC2(uint64 instruction)
+std::string NMD::MFC2(uint64_t instruction)
 {
-    uint64 cs_value = extract_cs_20_19_18_17_16(instruction);
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t cs_value = extract_cs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
 
     std::string rt = GPR(copy(rt_value));
     std::string cs = CPR(copy(cs_value));
@@ -10064,11 +10064,11 @@ std::string NMD::MFC2(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::MFGC0(uint64 instruction)
+std::string NMD::MFGC0(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 c0s_value = extract_c0s_20_19_18_17_16(instruction);
-    uint64 sel_value = extract_sel_15_14_13_12_11(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t c0s_value = extract_c0s_20_19_18_17_16(instruction);
+    uint64_t sel_value = extract_sel_15_14_13_12_11(instruction);
 
     std::string rt = GPR(copy(rt_value));
     std::string c0s = CPR(copy(c0s_value));
@@ -10088,11 +10088,11 @@ std::string NMD::MFGC0(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::MFHC0(uint64 instruction)
+std::string NMD::MFHC0(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 c0s_value = extract_c0s_20_19_18_17_16(instruction);
-    uint64 sel_value = extract_sel_15_14_13_12_11(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t c0s_value = extract_c0s_20_19_18_17_16(instruction);
+    uint64_t sel_value = extract_sel_15_14_13_12_11(instruction);
 
     std::string rt = GPR(copy(rt_value));
     std::string c0s = CPR(copy(c0s_value));
@@ -10112,10 +10112,10 @@ std::string NMD::MFHC0(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::MFHC1(uint64 instruction)
+std::string NMD::MFHC1(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 fs_value = extract_fs_15_14_13_12_11(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t fs_value = extract_fs_15_14_13_12_11(instruction);
 
     std::string rt = GPR(copy(rt_value));
     std::string fs = FPR(copy(fs_value));
@@ -10134,10 +10134,10 @@ std::string NMD::MFHC1(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::MFHC2(uint64 instruction)
+std::string NMD::MFHC2(uint64_t instruction)
 {
-    uint64 cs_value = extract_cs_20_19_18_17_16(instruction);
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t cs_value = extract_cs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
 
     std::string rt = GPR(copy(rt_value));
     std::string cs = CPR(copy(cs_value));
@@ -10156,11 +10156,11 @@ std::string NMD::MFHC2(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::MFHGC0(uint64 instruction)
+std::string NMD::MFHGC0(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 c0s_value = extract_c0s_20_19_18_17_16(instruction);
-    uint64 sel_value = extract_sel_15_14_13_12_11(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t c0s_value = extract_c0s_20_19_18_17_16(instruction);
+    uint64_t sel_value = extract_sel_15_14_13_12_11(instruction);
 
     std::string rt = GPR(copy(rt_value));
     std::string c0s = CPR(copy(c0s_value));
@@ -10180,10 +10180,10 @@ std::string NMD::MFHGC0(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::MFHI_DSP_(uint64 instruction)
+std::string NMD::MFHI_DSP_(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 ac_value = extract_ac_13_12(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t ac_value = extract_ac_13_12(instruction);
 
     std::string rt = GPR(copy(rt_value));
     std::string ac = AC(copy(ac_value));
@@ -10202,12 +10202,12 @@ std::string NMD::MFHI_DSP_(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::MFHTR(uint64 instruction)
+std::string NMD::MFHTR(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 c0s_value = extract_c0s_20_19_18_17_16(instruction);
-    uint64 sel_value = extract_sel_15_14_13_12_11(instruction);
-    uint64 u_value = extract_u_10(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t c0s_value = extract_c0s_20_19_18_17_16(instruction);
+    uint64_t sel_value = extract_sel_15_14_13_12_11(instruction);
+    uint64_t u_value = extract_u_10(instruction);
 
     std::string rt = GPR(copy(rt_value));
     std::string c0s = IMMEDIATE(copy(c0s_value));
@@ -10228,10 +10228,10 @@ std::string NMD::MFHTR(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::MFLO_DSP_(uint64 instruction)
+std::string NMD::MFLO_DSP_(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 ac_value = extract_ac_13_12(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t ac_value = extract_ac_13_12(instruction);
 
     std::string rt = GPR(copy(rt_value));
     std::string ac = AC(copy(ac_value));
@@ -10250,12 +10250,12 @@ std::string NMD::MFLO_DSP_(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::MFTR(uint64 instruction)
+std::string NMD::MFTR(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 c0s_value = extract_c0s_20_19_18_17_16(instruction);
-    uint64 sel_value = extract_sel_15_14_13_12_11(instruction);
-    uint64 u_value = extract_u_10(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t c0s_value = extract_c0s_20_19_18_17_16(instruction);
+    uint64_t sel_value = extract_sel_15_14_13_12_11(instruction);
+    uint64_t u_value = extract_u_10(instruction);
 
     std::string rt = GPR(copy(rt_value));
     std::string c0s = IMMEDIATE(copy(c0s_value));
@@ -10276,11 +10276,11 @@ std::string NMD::MFTR(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::MIN_D(uint64 instruction)
+std::string NMD::MIN_D(uint64_t instruction)
 {
-    uint64 fs_value = extract_fs_15_14_13_12_11(instruction);
-    uint64 ft_value = extract_ft_20_19_18_17_16(instruction);
-    uint64 fd_value = extract_fd_10_9_8_7_6(instruction);
+    uint64_t fs_value = extract_fs_15_14_13_12_11(instruction);
+    uint64_t ft_value = extract_ft_20_19_18_17_16(instruction);
+    uint64_t fd_value = extract_fd_10_9_8_7_6(instruction);
 
     std::string fd = FPR(copy(fd_value));
     std::string fs = FPR(copy(fs_value));
@@ -10300,11 +10300,11 @@ std::string NMD::MIN_D(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::MIN_S(uint64 instruction)
+std::string NMD::MIN_S(uint64_t instruction)
 {
-    uint64 fs_value = extract_fs_15_14_13_12_11(instruction);
-    uint64 ft_value = extract_ft_20_19_18_17_16(instruction);
-    uint64 fd_value = extract_fd_10_9_8_7_6(instruction);
+    uint64_t fs_value = extract_fs_15_14_13_12_11(instruction);
+    uint64_t ft_value = extract_ft_20_19_18_17_16(instruction);
+    uint64_t fd_value = extract_fd_10_9_8_7_6(instruction);
 
     std::string fd = FPR(copy(fd_value));
     std::string fs = FPR(copy(fs_value));
@@ -10324,11 +10324,11 @@ std::string NMD::MIN_S(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::MINA_D(uint64 instruction)
+std::string NMD::MINA_D(uint64_t instruction)
 {
-    uint64 fs_value = extract_fs_15_14_13_12_11(instruction);
-    uint64 ft_value = extract_ft_20_19_18_17_16(instruction);
-    uint64 fd_value = extract_fd_10_9_8_7_6(instruction);
+    uint64_t fs_value = extract_fs_15_14_13_12_11(instruction);
+    uint64_t ft_value = extract_ft_20_19_18_17_16(instruction);
+    uint64_t fd_value = extract_fd_10_9_8_7_6(instruction);
 
     std::string fd = FPR(copy(fd_value));
     std::string fs = FPR(copy(fs_value));
@@ -10348,11 +10348,11 @@ std::string NMD::MINA_D(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::MINA_S(uint64 instruction)
+std::string NMD::MINA_S(uint64_t instruction)
 {
-    uint64 fs_value = extract_fs_15_14_13_12_11(instruction);
-    uint64 ft_value = extract_ft_20_19_18_17_16(instruction);
-    uint64 fd_value = extract_fd_10_9_8_7_6(instruction);
+    uint64_t fs_value = extract_fs_15_14_13_12_11(instruction);
+    uint64_t ft_value = extract_ft_20_19_18_17_16(instruction);
+    uint64_t fd_value = extract_fd_10_9_8_7_6(instruction);
 
     std::string fd = FPR(copy(fd_value));
     std::string fs = FPR(copy(fs_value));
@@ -10372,11 +10372,11 @@ std::string NMD::MINA_S(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::MOD(uint64 instruction)
+std::string NMD::MOD(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 rd_value = extract_rd_20_19_18_17_16(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t rd_value = extract_rd_20_19_18_17_16(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rd = GPR(copy(rd_value));
     std::string rs = GPR(copy(rs_value));
@@ -10396,11 +10396,11 @@ std::string NMD::MOD(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::MODSUB(uint64 instruction)
+std::string NMD::MODSUB(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 rd_value = extract_rd_20_19_18_17_16(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t rd_value = extract_rd_20_19_18_17_16(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rd = GPR(copy(rd_value));
     std::string rs = GPR(copy(rs_value));
@@ -10420,11 +10420,11 @@ std::string NMD::MODSUB(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::MODU(uint64 instruction)
+std::string NMD::MODU(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 rd_value = extract_rd_20_19_18_17_16(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t rd_value = extract_rd_20_19_18_17_16(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rd = GPR(copy(rd_value));
     std::string rs = GPR(copy(rs_value));
@@ -10444,10 +10444,10 @@ std::string NMD::MODU(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::MOV_D(uint64 instruction)
+std::string NMD::MOV_D(uint64_t instruction)
 {
-    uint64 fs_value = extract_fs_15_14_13_12_11(instruction);
-    uint64 ft_value = extract_ft_20_19_18_17_16(instruction);
+    uint64_t fs_value = extract_fs_15_14_13_12_11(instruction);
+    uint64_t ft_value = extract_ft_20_19_18_17_16(instruction);
 
     std::string ft = FPR(copy(ft_value));
     std::string fs = FPR(copy(fs_value));
@@ -10466,10 +10466,10 @@ std::string NMD::MOV_D(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::MOV_S(uint64 instruction)
+std::string NMD::MOV_S(uint64_t instruction)
 {
-    uint64 fs_value = extract_fs_15_14_13_12_11(instruction);
-    uint64 ft_value = extract_ft_20_19_18_17_16(instruction);
+    uint64_t fs_value = extract_fs_15_14_13_12_11(instruction);
+    uint64_t ft_value = extract_ft_20_19_18_17_16(instruction);
 
     std::string ft = FPR(copy(ft_value));
     std::string fs = FPR(copy(fs_value));
@@ -10488,11 +10488,11 @@ std::string NMD::MOV_S(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::MOVE_BALC(uint64 instruction)
+std::string NMD::MOVE_BALC(uint64_t instruction)
 {
-    uint64 rd1_value = extract_rdl_25_24(instruction);
-    int64 s_value = extr_sil0il21bs1_il1il1bs20Tmsb21(instruction);
-    uint64 rtz4_value = extract_rtz4_27_26_25_23_22_21(instruction);
+    uint64_t rd1_value = extract_rdl_25_24(instruction);
+    int64_t s_value = extr_sil0il21bs1_il1il1bs20Tmsb21(instruction);
+    uint64_t rtz4_value = extract_rtz4_27_26_25_23_22_21(instruction);
 
     std::string rd1 = GPR(encode_rd1_from_rd(rd1_value));
     std::string rtz4 = GPR(encode_gpr4_zero(rtz4_value));
@@ -10512,11 +10512,11 @@ std::string NMD::MOVE_BALC(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::MOVEP(uint64 instruction)
+std::string NMD::MOVEP(uint64_t instruction)
 {
-    uint64 rsz4_value = extract_rsz4_4_2_1_0(instruction);
-    uint64 rtz4_value = extract_rtz4_9_7_6_5(instruction);
-    uint64 rd2_value = extract_rd2_3_8(instruction);
+    uint64_t rsz4_value = extract_rsz4_4_2_1_0(instruction);
+    uint64_t rtz4_value = extract_rtz4_9_7_6_5(instruction);
+    uint64_t rd2_value = extract_rd2_3_8(instruction);
 
     std::string rd2 = GPR(encode_rd2_reg1(rd2_value));
     std::string re2 = GPR(encode_rd2_reg2(rd2_value));
@@ -10539,11 +10539,11 @@ std::string NMD::MOVEP(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::MOVEP_REV_(uint64 instruction)
+std::string NMD::MOVEP_REV_(uint64_t instruction)
 {
-    uint64 rs4_value = extract_rs4_4_2_1_0(instruction);
-    uint64 rt4_value = extract_rt4_9_7_6_5(instruction);
-    uint64 rd2_value = extract_rd2_3_8(instruction);
+    uint64_t rs4_value = extract_rs4_4_2_1_0(instruction);
+    uint64_t rt4_value = extract_rt4_9_7_6_5(instruction);
+    uint64_t rd2_value = extract_rd2_3_8(instruction);
 
     std::string rs4 = GPR(encode_gpr4(rs4_value));
     std::string rt4 = GPR(encode_gpr4(rt4_value));
@@ -10566,10 +10566,10 @@ std::string NMD::MOVEP_REV_(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::MOVE(uint64 instruction)
+std::string NMD::MOVE(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_9_8_7_6_5(instruction);
-    uint64 rs_value = extract_rs_4_3_2_1_0(instruction);
+    uint64_t rt_value = extract_rt_9_8_7_6_5(instruction);
+    uint64_t rs_value = extract_rs_4_3_2_1_0(instruction);
 
     std::string rt = GPR(copy(rt_value));
     std::string rs = GPR(copy(rs_value));
@@ -10588,11 +10588,11 @@ std::string NMD::MOVE(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::MOVN(uint64 instruction)
+std::string NMD::MOVN(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 rd_value = extract_rd_20_19_18_17_16(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t rd_value = extract_rd_20_19_18_17_16(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rd = GPR(copy(rd_value));
     std::string rs = GPR(copy(rs_value));
@@ -10612,11 +10612,11 @@ std::string NMD::MOVN(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::MOVZ(uint64 instruction)
+std::string NMD::MOVZ(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 rd_value = extract_rd_20_19_18_17_16(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t rd_value = extract_rd_20_19_18_17_16(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rd = GPR(copy(rd_value));
     std::string rs = GPR(copy(rs_value));
@@ -10636,11 +10636,11 @@ std::string NMD::MOVZ(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::MSUB_DSP_(uint64 instruction)
+std::string NMD::MSUB_DSP_(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 ac_value = extract_ac_13_12(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t ac_value = extract_ac_13_12(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string ac = AC(copy(ac_value));
     std::string rs = GPR(copy(rs_value));
@@ -10660,11 +10660,11 @@ std::string NMD::MSUB_DSP_(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::MSUBF_D(uint64 instruction)
+std::string NMD::MSUBF_D(uint64_t instruction)
 {
-    uint64 fs_value = extract_fs_15_14_13_12_11(instruction);
-    uint64 ft_value = extract_ft_20_19_18_17_16(instruction);
-    uint64 fd_value = extract_fd_10_9_8_7_6(instruction);
+    uint64_t fs_value = extract_fs_15_14_13_12_11(instruction);
+    uint64_t ft_value = extract_ft_20_19_18_17_16(instruction);
+    uint64_t fd_value = extract_fd_10_9_8_7_6(instruction);
 
     std::string fd = FPR(copy(fd_value));
     std::string fs = FPR(copy(fs_value));
@@ -10684,11 +10684,11 @@ std::string NMD::MSUBF_D(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::MSUBF_S(uint64 instruction)
+std::string NMD::MSUBF_S(uint64_t instruction)
 {
-    uint64 fs_value = extract_fs_15_14_13_12_11(instruction);
-    uint64 ft_value = extract_ft_20_19_18_17_16(instruction);
-    uint64 fd_value = extract_fd_10_9_8_7_6(instruction);
+    uint64_t fs_value = extract_fs_15_14_13_12_11(instruction);
+    uint64_t ft_value = extract_ft_20_19_18_17_16(instruction);
+    uint64_t fd_value = extract_fd_10_9_8_7_6(instruction);
 
     std::string fd = FPR(copy(fd_value));
     std::string fs = FPR(copy(fs_value));
@@ -10708,11 +10708,11 @@ std::string NMD::MSUBF_S(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::MSUBU_DSP_(uint64 instruction)
+std::string NMD::MSUBU_DSP_(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 ac_value = extract_ac_13_12(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t ac_value = extract_ac_13_12(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string ac = AC(copy(ac_value));
     std::string rs = GPR(copy(rs_value));
@@ -10732,11 +10732,11 @@ std::string NMD::MSUBU_DSP_(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::MTC0(uint64 instruction)
+std::string NMD::MTC0(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 c0s_value = extract_c0s_20_19_18_17_16(instruction);
-    uint64 sel_value = extract_sel_15_14_13_12_11(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t c0s_value = extract_c0s_20_19_18_17_16(instruction);
+    uint64_t sel_value = extract_sel_15_14_13_12_11(instruction);
 
     std::string rt = GPR(copy(rt_value));
     std::string c0s = CPR(copy(c0s_value));
@@ -10756,10 +10756,10 @@ std::string NMD::MTC0(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::MTC1(uint64 instruction)
+std::string NMD::MTC1(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 fs_value = extract_fs_15_14_13_12_11(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t fs_value = extract_fs_15_14_13_12_11(instruction);
 
     std::string rt = GPR(copy(rt_value));
     std::string fs = FPR(copy(fs_value));
@@ -10778,10 +10778,10 @@ std::string NMD::MTC1(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::MTC2(uint64 instruction)
+std::string NMD::MTC2(uint64_t instruction)
 {
-    uint64 cs_value = extract_cs_20_19_18_17_16(instruction);
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t cs_value = extract_cs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
 
     std::string rt = GPR(copy(rt_value));
     std::string cs = CPR(copy(cs_value));
@@ -10800,11 +10800,11 @@ std::string NMD::MTC2(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::MTGC0(uint64 instruction)
+std::string NMD::MTGC0(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 c0s_value = extract_c0s_20_19_18_17_16(instruction);
-    uint64 sel_value = extract_sel_15_14_13_12_11(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t c0s_value = extract_c0s_20_19_18_17_16(instruction);
+    uint64_t sel_value = extract_sel_15_14_13_12_11(instruction);
 
     std::string rt = GPR(copy(rt_value));
     std::string c0s = CPR(copy(c0s_value));
@@ -10824,11 +10824,11 @@ std::string NMD::MTGC0(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::MTHC0(uint64 instruction)
+std::string NMD::MTHC0(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 c0s_value = extract_c0s_20_19_18_17_16(instruction);
-    uint64 sel_value = extract_sel_15_14_13_12_11(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t c0s_value = extract_c0s_20_19_18_17_16(instruction);
+    uint64_t sel_value = extract_sel_15_14_13_12_11(instruction);
 
     std::string rt = GPR(copy(rt_value));
     std::string c0s = CPR(copy(c0s_value));
@@ -10848,10 +10848,10 @@ std::string NMD::MTHC0(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::MTHC1(uint64 instruction)
+std::string NMD::MTHC1(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 fs_value = extract_fs_15_14_13_12_11(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t fs_value = extract_fs_15_14_13_12_11(instruction);
 
     std::string rt = GPR(copy(rt_value));
     std::string fs = FPR(copy(fs_value));
@@ -10870,10 +10870,10 @@ std::string NMD::MTHC1(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::MTHC2(uint64 instruction)
+std::string NMD::MTHC2(uint64_t instruction)
 {
-    uint64 cs_value = extract_cs_20_19_18_17_16(instruction);
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t cs_value = extract_cs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
 
     std::string rt = GPR(copy(rt_value));
     std::string cs = CPR(copy(cs_value));
@@ -10892,11 +10892,11 @@ std::string NMD::MTHC2(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::MTHGC0(uint64 instruction)
+std::string NMD::MTHGC0(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 c0s_value = extract_c0s_20_19_18_17_16(instruction);
-    uint64 sel_value = extract_sel_15_14_13_12_11(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t c0s_value = extract_c0s_20_19_18_17_16(instruction);
+    uint64_t sel_value = extract_sel_15_14_13_12_11(instruction);
 
     std::string rt = GPR(copy(rt_value));
     std::string c0s = CPR(copy(c0s_value));
@@ -10916,10 +10916,10 @@ std::string NMD::MTHGC0(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::MTHI_DSP_(uint64 instruction)
+std::string NMD::MTHI_DSP_(uint64_t instruction)
 {
-    uint64 ac_value = extract_ac_13_12(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t ac_value = extract_ac_13_12(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rs = GPR(copy(rs_value));
     std::string ac = AC(copy(ac_value));
@@ -10938,10 +10938,10 @@ std::string NMD::MTHI_DSP_(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::MTHLIP(uint64 instruction)
+std::string NMD::MTHLIP(uint64_t instruction)
 {
-    uint64 ac_value = extract_ac_13_12(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t ac_value = extract_ac_13_12(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rs = GPR(copy(rs_value));
     std::string ac = AC(copy(ac_value));
@@ -10960,12 +10960,12 @@ std::string NMD::MTHLIP(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::MTHTR(uint64 instruction)
+std::string NMD::MTHTR(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 c0s_value = extract_c0s_20_19_18_17_16(instruction);
-    uint64 sel_value = extract_sel_15_14_13_12_11(instruction);
-    uint64 u_value = extract_u_10(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t c0s_value = extract_c0s_20_19_18_17_16(instruction);
+    uint64_t sel_value = extract_sel_15_14_13_12_11(instruction);
+    uint64_t u_value = extract_u_10(instruction);
 
     std::string rt = GPR(copy(rt_value));
     std::string c0s = IMMEDIATE(copy(c0s_value));
@@ -10986,10 +10986,10 @@ std::string NMD::MTHTR(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::MTLO_DSP_(uint64 instruction)
+std::string NMD::MTLO_DSP_(uint64_t instruction)
 {
-    uint64 ac_value = extract_ac_13_12(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t ac_value = extract_ac_13_12(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rs = GPR(copy(rs_value));
     std::string ac = AC(copy(ac_value));
@@ -11008,12 +11008,12 @@ std::string NMD::MTLO_DSP_(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::MTTR(uint64 instruction)
+std::string NMD::MTTR(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 c0s_value = extract_c0s_20_19_18_17_16(instruction);
-    uint64 sel_value = extract_sel_15_14_13_12_11(instruction);
-    uint64 u_value = extract_u_10(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t c0s_value = extract_c0s_20_19_18_17_16(instruction);
+    uint64_t sel_value = extract_sel_15_14_13_12_11(instruction);
+    uint64_t u_value = extract_u_10(instruction);
 
     std::string rt = GPR(copy(rt_value));
     std::string c0s = IMMEDIATE(copy(c0s_value));
@@ -11034,11 +11034,11 @@ std::string NMD::MTTR(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::MUH(uint64 instruction)
+std::string NMD::MUH(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 rd_value = extract_rd_20_19_18_17_16(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t rd_value = extract_rd_20_19_18_17_16(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rd = GPR(copy(rd_value));
     std::string rs = GPR(copy(rs_value));
@@ -11058,11 +11058,11 @@ std::string NMD::MUH(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::MUHU(uint64 instruction)
+std::string NMD::MUHU(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 rd_value = extract_rd_20_19_18_17_16(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t rd_value = extract_rd_20_19_18_17_16(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rd = GPR(copy(rd_value));
     std::string rs = GPR(copy(rs_value));
@@ -11082,11 +11082,11 @@ std::string NMD::MUHU(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::MUL_32_(uint64 instruction)
+std::string NMD::MUL_32_(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 rd_value = extract_rd_20_19_18_17_16(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t rd_value = extract_rd_20_19_18_17_16(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rd = GPR(copy(rd_value));
     std::string rs = GPR(copy(rs_value));
@@ -11106,10 +11106,10 @@ std::string NMD::MUL_32_(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::MUL_4X4_(uint64 instruction)
+std::string NMD::MUL_4X4_(uint64_t instruction)
 {
-    uint64 rs4_value = extract_rs4_4_2_1_0(instruction);
-    uint64 rt4_value = extract_rt4_9_7_6_5(instruction);
+    uint64_t rs4_value = extract_rs4_4_2_1_0(instruction);
+    uint64_t rt4_value = extract_rt4_9_7_6_5(instruction);
 
     std::string rs4 = GPR(encode_gpr4(rs4_value));
     std::string rt4 = GPR(encode_gpr4(rt4_value));
@@ -11128,11 +11128,11 @@ std::string NMD::MUL_4X4_(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::MUL_D(uint64 instruction)
+std::string NMD::MUL_D(uint64_t instruction)
 {
-    uint64 fs_value = extract_fs_15_14_13_12_11(instruction);
-    uint64 ft_value = extract_ft_20_19_18_17_16(instruction);
-    uint64 fd_value = extract_fd_10_9_8_7_6(instruction);
+    uint64_t fs_value = extract_fs_15_14_13_12_11(instruction);
+    uint64_t ft_value = extract_ft_20_19_18_17_16(instruction);
+    uint64_t fd_value = extract_fd_10_9_8_7_6(instruction);
 
     std::string fd = FPR(copy(fd_value));
     std::string fs = FPR(copy(fs_value));
@@ -11152,11 +11152,11 @@ std::string NMD::MUL_D(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::MUL_PH(uint64 instruction)
+std::string NMD::MUL_PH(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 rd_value = extract_rd_20_19_18_17_16(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t rd_value = extract_rd_20_19_18_17_16(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rd = GPR(copy(rd_value));
     std::string rs = GPR(copy(rs_value));
@@ -11176,11 +11176,11 @@ std::string NMD::MUL_PH(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::MUL_S_PH(uint64 instruction)
+std::string NMD::MUL_S_PH(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 rd_value = extract_rd_20_19_18_17_16(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t rd_value = extract_rd_20_19_18_17_16(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rd = GPR(copy(rd_value));
     std::string rs = GPR(copy(rs_value));
@@ -11200,11 +11200,11 @@ std::string NMD::MUL_S_PH(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::MUL_S(uint64 instruction)
+std::string NMD::MUL_S(uint64_t instruction)
 {
-    uint64 fs_value = extract_fs_15_14_13_12_11(instruction);
-    uint64 ft_value = extract_ft_20_19_18_17_16(instruction);
-    uint64 fd_value = extract_fd_10_9_8_7_6(instruction);
+    uint64_t fs_value = extract_fs_15_14_13_12_11(instruction);
+    uint64_t ft_value = extract_ft_20_19_18_17_16(instruction);
+    uint64_t fd_value = extract_fd_10_9_8_7_6(instruction);
 
     std::string fd = FPR(copy(fd_value));
     std::string fs = FPR(copy(fs_value));
@@ -11224,11 +11224,11 @@ std::string NMD::MUL_S(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::MULEQ_S_W_PHL(uint64 instruction)
+std::string NMD::MULEQ_S_W_PHL(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 rd_value = extract_rd_20_19_18_17_16(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t rd_value = extract_rd_20_19_18_17_16(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rd = GPR(copy(rd_value));
     std::string rs = GPR(copy(rs_value));
@@ -11248,11 +11248,11 @@ std::string NMD::MULEQ_S_W_PHL(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::MULEQ_S_W_PHR(uint64 instruction)
+std::string NMD::MULEQ_S_W_PHR(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 rd_value = extract_rd_20_19_18_17_16(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t rd_value = extract_rd_20_19_18_17_16(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rd = GPR(copy(rd_value));
     std::string rs = GPR(copy(rs_value));
@@ -11272,11 +11272,11 @@ std::string NMD::MULEQ_S_W_PHR(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::MULEU_S_PH_QBL(uint64 instruction)
+std::string NMD::MULEU_S_PH_QBL(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 rd_value = extract_rd_20_19_18_17_16(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t rd_value = extract_rd_20_19_18_17_16(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rd = GPR(copy(rd_value));
     std::string rs = GPR(copy(rs_value));
@@ -11296,11 +11296,11 @@ std::string NMD::MULEU_S_PH_QBL(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::MULEU_S_PH_QBR(uint64 instruction)
+std::string NMD::MULEU_S_PH_QBR(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 rd_value = extract_rd_20_19_18_17_16(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t rd_value = extract_rd_20_19_18_17_16(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rd = GPR(copy(rd_value));
     std::string rs = GPR(copy(rs_value));
@@ -11320,11 +11320,11 @@ std::string NMD::MULEU_S_PH_QBR(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::MULQ_RS_PH(uint64 instruction)
+std::string NMD::MULQ_RS_PH(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 rd_value = extract_rd_20_19_18_17_16(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t rd_value = extract_rd_20_19_18_17_16(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rd = GPR(copy(rd_value));
     std::string rs = GPR(copy(rs_value));
@@ -11344,11 +11344,11 @@ std::string NMD::MULQ_RS_PH(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::MULQ_RS_W(uint64 instruction)
+std::string NMD::MULQ_RS_W(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 rd_value = extract_rd_20_19_18_17_16(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t rd_value = extract_rd_20_19_18_17_16(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rd = GPR(copy(rd_value));
     std::string rs = GPR(copy(rs_value));
@@ -11368,11 +11368,11 @@ std::string NMD::MULQ_RS_W(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::MULQ_S_PH(uint64 instruction)
+std::string NMD::MULQ_S_PH(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 rd_value = extract_rd_20_19_18_17_16(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t rd_value = extract_rd_20_19_18_17_16(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rd = GPR(copy(rd_value));
     std::string rs = GPR(copy(rs_value));
@@ -11392,11 +11392,11 @@ std::string NMD::MULQ_S_PH(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::MULQ_S_W(uint64 instruction)
+std::string NMD::MULQ_S_W(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 rd_value = extract_rd_20_19_18_17_16(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t rd_value = extract_rd_20_19_18_17_16(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rd = GPR(copy(rd_value));
     std::string rs = GPR(copy(rs_value));
@@ -11416,11 +11416,11 @@ std::string NMD::MULQ_S_W(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::MULSA_W_PH(uint64 instruction)
+std::string NMD::MULSA_W_PH(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 ac_value = extract_ac_13_12(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t ac_value = extract_ac_13_12(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string ac = AC(copy(ac_value));
     std::string rs = GPR(copy(rs_value));
@@ -11440,11 +11440,11 @@ std::string NMD::MULSA_W_PH(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::MULSAQ_S_W_PH(uint64 instruction)
+std::string NMD::MULSAQ_S_W_PH(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 ac_value = extract_ac_13_12(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t ac_value = extract_ac_13_12(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string ac = AC(copy(ac_value));
     std::string rs = GPR(copy(rs_value));
@@ -11464,11 +11464,11 @@ std::string NMD::MULSAQ_S_W_PH(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::MULT_DSP_(uint64 instruction)
+std::string NMD::MULT_DSP_(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 ac_value = extract_ac_13_12(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t ac_value = extract_ac_13_12(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string ac = AC(copy(ac_value));
     std::string rs = GPR(copy(rs_value));
@@ -11488,11 +11488,11 @@ std::string NMD::MULT_DSP_(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::MULTU_DSP_(uint64 instruction)
+std::string NMD::MULTU_DSP_(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 ac_value = extract_ac_13_12(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t ac_value = extract_ac_13_12(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string ac = AC(copy(ac_value));
     std::string rs = GPR(copy(rs_value));
@@ -11512,11 +11512,11 @@ std::string NMD::MULTU_DSP_(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::MULU(uint64 instruction)
+std::string NMD::MULU(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 rd_value = extract_rd_20_19_18_17_16(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t rd_value = extract_rd_20_19_18_17_16(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rd = GPR(copy(rd_value));
     std::string rs = GPR(copy(rs_value));
@@ -11536,10 +11536,10 @@ std::string NMD::MULU(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::NEG_D(uint64 instruction)
+std::string NMD::NEG_D(uint64_t instruction)
 {
-    uint64 fs_value = extract_fs_15_14_13_12_11(instruction);
-    uint64 ft_value = extract_ft_20_19_18_17_16(instruction);
+    uint64_t fs_value = extract_fs_15_14_13_12_11(instruction);
+    uint64_t ft_value = extract_ft_20_19_18_17_16(instruction);
 
     std::string ft = FPR(copy(ft_value));
     std::string fs = FPR(copy(fs_value));
@@ -11558,10 +11558,10 @@ std::string NMD::NEG_D(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::NEG_S(uint64 instruction)
+std::string NMD::NEG_S(uint64_t instruction)
 {
-    uint64 fs_value = extract_fs_15_14_13_12_11(instruction);
-    uint64 ft_value = extract_ft_20_19_18_17_16(instruction);
+    uint64_t fs_value = extract_fs_15_14_13_12_11(instruction);
+    uint64_t ft_value = extract_ft_20_19_18_17_16(instruction);
 
     std::string ft = FPR(copy(ft_value));
     std::string fs = FPR(copy(fs_value));
@@ -11580,7 +11580,7 @@ std::string NMD::NEG_S(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::NOP_16_(uint64 instruction)
+std::string NMD::NOP_16_(uint64_t instruction)
 {
     (void)instruction;
 
@@ -11598,7 +11598,7 @@ std::string NMD::NOP_16_(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::NOP_32_(uint64 instruction)
+std::string NMD::NOP_32_(uint64_t instruction)
 {
     (void)instruction;
 
@@ -11616,11 +11616,11 @@ std::string NMD::NOP_32_(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::NOR(uint64 instruction)
+std::string NMD::NOR(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 rd_value = extract_rd_20_19_18_17_16(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t rd_value = extract_rd_20_19_18_17_16(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rd = GPR(copy(rd_value));
     std::string rs = GPR(copy(rs_value));
@@ -11640,10 +11640,10 @@ std::string NMD::NOR(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::NOT_16_(uint64 instruction)
+std::string NMD::NOT_16_(uint64_t instruction)
 {
-    uint64 rt3_value = extract_rt3_9_8_7(instruction);
-    uint64 rs3_value = extract_rs3_6_5_4(instruction);
+    uint64_t rt3_value = extract_rt3_9_8_7(instruction);
+    uint64_t rs3_value = extract_rs3_6_5_4(instruction);
 
     std::string rt3 = GPR(encode_gpr3(rt3_value));
     std::string rs3 = GPR(encode_gpr3(rs3_value));
@@ -11662,10 +11662,10 @@ std::string NMD::NOT_16_(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::OR_16_(uint64 instruction)
+std::string NMD::OR_16_(uint64_t instruction)
 {
-    uint64 rt3_value = extract_rt3_9_8_7(instruction);
-    uint64 rs3_value = extract_rs3_6_5_4(instruction);
+    uint64_t rt3_value = extract_rt3_9_8_7(instruction);
+    uint64_t rs3_value = extract_rs3_6_5_4(instruction);
 
     std::string rs3 = GPR(encode_gpr3(rs3_value));
     std::string rt3 = GPR(encode_gpr3(rt3_value));
@@ -11684,11 +11684,11 @@ std::string NMD::OR_16_(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::OR_32_(uint64 instruction)
+std::string NMD::OR_32_(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 rd_value = extract_rd_20_19_18_17_16(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t rd_value = extract_rd_20_19_18_17_16(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rd = GPR(copy(rd_value));
     std::string rs = GPR(copy(rs_value));
@@ -11708,11 +11708,11 @@ std::string NMD::OR_32_(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::ORI(uint64 instruction)
+std::string NMD::ORI(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 u_value = extract_u_11_10_9_8_7_6_5_4_3_2_1_0(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t u_value = extract_u_11_10_9_8_7_6_5_4_3_2_1_0(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rt = GPR(copy(rt_value));
     std::string rs = GPR(copy(rs_value));
@@ -11732,11 +11732,11 @@ std::string NMD::ORI(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::PACKRL_PH(uint64 instruction)
+std::string NMD::PACKRL_PH(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 rd_value = extract_rd_20_19_18_17_16(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t rd_value = extract_rd_20_19_18_17_16(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rd = GPR(copy(rd_value));
     std::string rs = GPR(copy(rs_value));
@@ -11756,7 +11756,7 @@ std::string NMD::PACKRL_PH(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::PAUSE(uint64 instruction)
+std::string NMD::PAUSE(uint64_t instruction)
 {
     (void)instruction;
 
@@ -11774,11 +11774,11 @@ std::string NMD::PAUSE(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::PICK_PH(uint64 instruction)
+std::string NMD::PICK_PH(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 rd_value = extract_rd_20_19_18_17_16(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t rd_value = extract_rd_20_19_18_17_16(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rd = GPR(copy(rd_value));
     std::string rs = GPR(copy(rs_value));
@@ -11798,11 +11798,11 @@ std::string NMD::PICK_PH(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::PICK_QB(uint64 instruction)
+std::string NMD::PICK_QB(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 rd_value = extract_rd_20_19_18_17_16(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t rd_value = extract_rd_20_19_18_17_16(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rd = GPR(copy(rd_value));
     std::string rs = GPR(copy(rs_value));
@@ -11822,10 +11822,10 @@ std::string NMD::PICK_QB(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::PRECEQ_W_PHL(uint64 instruction)
+std::string NMD::PRECEQ_W_PHL(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rt = GPR(copy(rt_value));
     std::string rs = GPR(copy(rs_value));
@@ -11844,10 +11844,10 @@ std::string NMD::PRECEQ_W_PHL(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::PRECEQ_W_PHR(uint64 instruction)
+std::string NMD::PRECEQ_W_PHR(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rt = GPR(copy(rt_value));
     std::string rs = GPR(copy(rs_value));
@@ -11866,10 +11866,10 @@ std::string NMD::PRECEQ_W_PHR(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::PRECEQU_PH_QBLA(uint64 instruction)
+std::string NMD::PRECEQU_PH_QBLA(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rt = GPR(copy(rt_value));
     std::string rs = GPR(copy(rs_value));
@@ -11888,10 +11888,10 @@ std::string NMD::PRECEQU_PH_QBLA(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::PRECEQU_PH_QBL(uint64 instruction)
+std::string NMD::PRECEQU_PH_QBL(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rt = GPR(copy(rt_value));
     std::string rs = GPR(copy(rs_value));
@@ -11910,10 +11910,10 @@ std::string NMD::PRECEQU_PH_QBL(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::PRECEQU_PH_QBRA(uint64 instruction)
+std::string NMD::PRECEQU_PH_QBRA(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rt = GPR(copy(rt_value));
     std::string rs = GPR(copy(rs_value));
@@ -11932,10 +11932,10 @@ std::string NMD::PRECEQU_PH_QBRA(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::PRECEQU_PH_QBR(uint64 instruction)
+std::string NMD::PRECEQU_PH_QBR(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rt = GPR(copy(rt_value));
     std::string rs = GPR(copy(rs_value));
@@ -11954,10 +11954,10 @@ std::string NMD::PRECEQU_PH_QBR(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::PRECEU_PH_QBLA(uint64 instruction)
+std::string NMD::PRECEU_PH_QBLA(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rt = GPR(copy(rt_value));
     std::string rs = GPR(copy(rs_value));
@@ -11976,10 +11976,10 @@ std::string NMD::PRECEU_PH_QBLA(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::PRECEU_PH_QBL(uint64 instruction)
+std::string NMD::PRECEU_PH_QBL(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rt = GPR(copy(rt_value));
     std::string rs = GPR(copy(rs_value));
@@ -11998,10 +11998,10 @@ std::string NMD::PRECEU_PH_QBL(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::PRECEU_PH_QBRA(uint64 instruction)
+std::string NMD::PRECEU_PH_QBRA(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rt = GPR(copy(rt_value));
     std::string rs = GPR(copy(rs_value));
@@ -12020,10 +12020,10 @@ std::string NMD::PRECEU_PH_QBRA(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::PRECEU_PH_QBR(uint64 instruction)
+std::string NMD::PRECEU_PH_QBR(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rt = GPR(copy(rt_value));
     std::string rs = GPR(copy(rs_value));
@@ -12042,11 +12042,11 @@ std::string NMD::PRECEU_PH_QBR(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::PRECR_QB_PH(uint64 instruction)
+std::string NMD::PRECR_QB_PH(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 rd_value = extract_rd_20_19_18_17_16(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t rd_value = extract_rd_20_19_18_17_16(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rd = GPR(copy(rd_value));
     std::string rs = GPR(copy(rs_value));
@@ -12066,11 +12066,11 @@ std::string NMD::PRECR_QB_PH(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::PRECR_SRA_PH_W(uint64 instruction)
+std::string NMD::PRECR_SRA_PH_W(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 sa_value = extract_sa_15_14_13_12_11(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t sa_value = extract_sa_15_14_13_12_11(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rt = GPR(copy(rt_value));
     std::string rs = GPR(copy(rs_value));
@@ -12090,11 +12090,11 @@ std::string NMD::PRECR_SRA_PH_W(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::PRECR_SRA_R_PH_W(uint64 instruction)
+std::string NMD::PRECR_SRA_R_PH_W(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 sa_value = extract_sa_15_14_13_12_11(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t sa_value = extract_sa_15_14_13_12_11(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rt = GPR(copy(rt_value));
     std::string rs = GPR(copy(rs_value));
@@ -12114,11 +12114,11 @@ std::string NMD::PRECR_SRA_R_PH_W(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::PRECRQ_PH_W(uint64 instruction)
+std::string NMD::PRECRQ_PH_W(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 rd_value = extract_rd_20_19_18_17_16(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t rd_value = extract_rd_20_19_18_17_16(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rd = GPR(copy(rd_value));
     std::string rs = GPR(copy(rs_value));
@@ -12138,11 +12138,11 @@ std::string NMD::PRECRQ_PH_W(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::PRECRQ_QB_PH(uint64 instruction)
+std::string NMD::PRECRQ_QB_PH(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 rd_value = extract_rd_20_19_18_17_16(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t rd_value = extract_rd_20_19_18_17_16(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rd = GPR(copy(rd_value));
     std::string rs = GPR(copy(rs_value));
@@ -12162,11 +12162,11 @@ std::string NMD::PRECRQ_QB_PH(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::PRECRQ_RS_PH_W(uint64 instruction)
+std::string NMD::PRECRQ_RS_PH_W(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 rd_value = extract_rd_20_19_18_17_16(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t rd_value = extract_rd_20_19_18_17_16(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rd = GPR(copy(rd_value));
     std::string rs = GPR(copy(rs_value));
@@ -12186,11 +12186,11 @@ std::string NMD::PRECRQ_RS_PH_W(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::PRECRQU_S_QB_PH(uint64 instruction)
+std::string NMD::PRECRQU_S_QB_PH(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 rd_value = extract_rd_20_19_18_17_16(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t rd_value = extract_rd_20_19_18_17_16(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rd = GPR(copy(rd_value));
     std::string rs = GPR(copy(rs_value));
@@ -12210,11 +12210,11 @@ std::string NMD::PRECRQU_S_QB_PH(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::PREF_S9_(uint64 instruction)
+std::string NMD::PREF_S9_(uint64_t instruction)
 {
-    int64 s_value = extr_sil0il0bs8_il15il8bs1Tmsb8(instruction);
-    uint64 hint_value = extract_hint_25_24_23_22_21(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    int64_t s_value = extr_sil0il0bs8_il15il8bs1Tmsb8(instruction);
+    uint64_t hint_value = extract_hint_25_24_23_22_21(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string hint = IMMEDIATE(copy(hint_value));
     std::string s = IMMEDIATE(copy(s_value));
@@ -12234,11 +12234,11 @@ std::string NMD::PREF_S9_(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::PREF_U12_(uint64 instruction)
+std::string NMD::PREF_U12_(uint64_t instruction)
 {
-    uint64 hint_value = extract_hint_25_24_23_22_21(instruction);
-    uint64 u_value = extract_u_11_10_9_8_7_6_5_4_3_2_1_0(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t hint_value = extract_hint_25_24_23_22_21(instruction);
+    uint64_t u_value = extract_u_11_10_9_8_7_6_5_4_3_2_1_0(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string hint = IMMEDIATE(copy(hint_value));
     std::string u = IMMEDIATE(copy(u_value));
@@ -12258,11 +12258,11 @@ std::string NMD::PREF_U12_(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::PREFE(uint64 instruction)
+std::string NMD::PREFE(uint64_t instruction)
 {
-    int64 s_value = extr_sil0il0bs8_il15il8bs1Tmsb8(instruction);
-    uint64 hint_value = extract_hint_25_24_23_22_21(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    int64_t s_value = extr_sil0il0bs8_il15il8bs1Tmsb8(instruction);
+    uint64_t hint_value = extract_hint_25_24_23_22_21(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string hint = IMMEDIATE(copy(hint_value));
     std::string s = IMMEDIATE(copy(s_value));
@@ -12282,11 +12282,11 @@ std::string NMD::PREFE(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::PREPEND(uint64 instruction)
+std::string NMD::PREPEND(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 sa_value = extract_sa_15_14_13_12_11(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t sa_value = extract_sa_15_14_13_12_11(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rt = GPR(copy(rt_value));
     std::string rs = GPR(copy(rs_value));
@@ -12306,10 +12306,10 @@ std::string NMD::PREPEND(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::RADDU_W_QB(uint64 instruction)
+std::string NMD::RADDU_W_QB(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rt = GPR(copy(rt_value));
     std::string rs = GPR(copy(rs_value));
@@ -12328,10 +12328,10 @@ std::string NMD::RADDU_W_QB(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::RDDSP(uint64 instruction)
+std::string NMD::RDDSP(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 mask_value = extract_mask_20_19_18_17_16_15_14(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t mask_value = extract_mask_20_19_18_17_16_15_14(instruction);
 
     std::string rt = GPR(copy(rt_value));
     std::string mask = IMMEDIATE(copy(mask_value));
@@ -12350,11 +12350,11 @@ std::string NMD::RDDSP(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::RDHWR(uint64 instruction)
+std::string NMD::RDHWR(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 hs_value = extract_hs_20_19_18_17_16(instruction);
-    uint64 sel_value = extract_sel_13_12_11(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t hs_value = extract_hs_20_19_18_17_16(instruction);
+    uint64_t sel_value = extract_sel_13_12_11(instruction);
 
     std::string rt = GPR(copy(rt_value));
     std::string hs = CPR(copy(hs_value));
@@ -12374,10 +12374,10 @@ std::string NMD::RDHWR(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::RDPGPR(uint64 instruction)
+std::string NMD::RDPGPR(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rt = GPR(copy(rt_value));
     std::string rs = GPR(copy(rs_value));
@@ -12396,10 +12396,10 @@ std::string NMD::RDPGPR(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::RECIP_D(uint64 instruction)
+std::string NMD::RECIP_D(uint64_t instruction)
 {
-    uint64 fs_value = extract_fs_15_14_13_12_11(instruction);
-    uint64 ft_value = extract_ft_20_19_18_17_16(instruction);
+    uint64_t fs_value = extract_fs_15_14_13_12_11(instruction);
+    uint64_t ft_value = extract_ft_20_19_18_17_16(instruction);
 
     std::string ft = FPR(copy(ft_value));
     std::string fs = FPR(copy(fs_value));
@@ -12418,10 +12418,10 @@ std::string NMD::RECIP_D(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::RECIP_S(uint64 instruction)
+std::string NMD::RECIP_S(uint64_t instruction)
 {
-    uint64 fs_value = extract_fs_15_14_13_12_11(instruction);
-    uint64 ft_value = extract_ft_20_19_18_17_16(instruction);
+    uint64_t fs_value = extract_fs_15_14_13_12_11(instruction);
+    uint64_t ft_value = extract_ft_20_19_18_17_16(instruction);
 
     std::string ft = FPR(copy(ft_value));
     std::string fs = FPR(copy(fs_value));
@@ -12440,10 +12440,10 @@ std::string NMD::RECIP_S(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::REPL_PH(uint64 instruction)
+std::string NMD::REPL_PH(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    int64 s_value = extr_sil11il0bs10Tmsb9(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    int64_t s_value = extr_sil11il0bs10Tmsb9(instruction);
 
     std::string rt = GPR(copy(rt_value));
     std::string s = IMMEDIATE(copy(s_value));
@@ -12462,10 +12462,10 @@ std::string NMD::REPL_PH(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::REPL_QB(uint64 instruction)
+std::string NMD::REPL_QB(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 u_value = extract_u_20_19_18_17_16_15_14_13(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t u_value = extract_u_20_19_18_17_16_15_14_13(instruction);
 
     std::string rt = GPR(copy(rt_value));
     std::string u = IMMEDIATE(copy(u_value));
@@ -12484,10 +12484,10 @@ std::string NMD::REPL_QB(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::REPLV_PH(uint64 instruction)
+std::string NMD::REPLV_PH(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rt = GPR(copy(rt_value));
     std::string rs = GPR(copy(rs_value));
@@ -12506,10 +12506,10 @@ std::string NMD::REPLV_PH(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::REPLV_QB(uint64 instruction)
+std::string NMD::REPLV_QB(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rt = GPR(copy(rt_value));
     std::string rs = GPR(copy(rs_value));
@@ -12528,12 +12528,12 @@ std::string NMD::REPLV_QB(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::RESTORE_32_(uint64 instruction)
+std::string NMD::RESTORE_32_(uint64_t instruction)
 {
-    uint64 count_value = extract_count_19_18_17_16(instruction);
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 u_value = extr_uil3il3bs9Fmsb11(instruction);
-    uint64 gp_value = extract_gp_2(instruction);
+    uint64_t count_value = extract_count_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t u_value = extr_uil3il3bs9Fmsb11(instruction);
+    uint64_t gp_value = extract_gp_2(instruction);
 
     std::string u = IMMEDIATE(copy(u_value));
     return img::format("RESTORE %s%s", u,
@@ -12551,11 +12551,11 @@ std::string NMD::RESTORE_32_(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::RESTORE_JRC_16_(uint64 instruction)
+std::string NMD::RESTORE_JRC_16_(uint64_t instruction)
 {
-    uint64 count_value = extract_count_3_2_1_0(instruction);
-    uint64 rt1_value = extract_rtl_11(instruction);
-    uint64 u_value = extr_uil4il4bs4Fmsb7(instruction);
+    uint64_t count_value = extract_count_3_2_1_0(instruction);
+    uint64_t rt1_value = extract_rtl_11(instruction);
+    uint64_t u_value = extr_uil4il4bs4Fmsb7(instruction);
 
     std::string u = IMMEDIATE(copy(u_value));
     return img::format("RESTORE.JRC %s%s", u,
@@ -12573,12 +12573,12 @@ std::string NMD::RESTORE_JRC_16_(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::RESTORE_JRC_32_(uint64 instruction)
+std::string NMD::RESTORE_JRC_32_(uint64_t instruction)
 {
-    uint64 count_value = extract_count_19_18_17_16(instruction);
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 u_value = extr_uil3il3bs9Fmsb11(instruction);
-    uint64 gp_value = extract_gp_2(instruction);
+    uint64_t count_value = extract_count_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t u_value = extr_uil3il3bs9Fmsb11(instruction);
+    uint64_t gp_value = extract_gp_2(instruction);
 
     std::string u = IMMEDIATE(copy(u_value));
     return img::format("RESTORE.JRC %s%s", u,
@@ -12596,10 +12596,10 @@ std::string NMD::RESTORE_JRC_32_(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::RESTOREF(uint64 instruction)
+std::string NMD::RESTOREF(uint64_t instruction)
 {
-    uint64 count_value = extract_count_19_18_17_16(instruction);
-    uint64 u_value = extr_uil3il3bs9Fmsb11(instruction);
+    uint64_t count_value = extract_count_19_18_17_16(instruction);
+    uint64_t u_value = extr_uil3il3bs9Fmsb11(instruction);
 
     std::string u = IMMEDIATE(copy(u_value));
     std::string count = IMMEDIATE(copy(count_value));
@@ -12618,10 +12618,10 @@ std::string NMD::RESTOREF(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::RINT_D(uint64 instruction)
+std::string NMD::RINT_D(uint64_t instruction)
 {
-    uint64 fs_value = extract_fs_15_14_13_12_11(instruction);
-    uint64 ft_value = extract_ft_20_19_18_17_16(instruction);
+    uint64_t fs_value = extract_fs_15_14_13_12_11(instruction);
+    uint64_t ft_value = extract_ft_20_19_18_17_16(instruction);
 
     std::string ft = FPR(copy(ft_value));
     std::string fs = FPR(copy(fs_value));
@@ -12640,10 +12640,10 @@ std::string NMD::RINT_D(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::RINT_S(uint64 instruction)
+std::string NMD::RINT_S(uint64_t instruction)
 {
-    uint64 fs_value = extract_fs_15_14_13_12_11(instruction);
-    uint64 ft_value = extract_ft_20_19_18_17_16(instruction);
+    uint64_t fs_value = extract_fs_15_14_13_12_11(instruction);
+    uint64_t ft_value = extract_ft_20_19_18_17_16(instruction);
 
     std::string ft = FPR(copy(ft_value));
     std::string fs = FPR(copy(fs_value));
@@ -12662,11 +12662,11 @@ std::string NMD::RINT_S(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::ROTR(uint64 instruction)
+std::string NMD::ROTR(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 shift_value = extract_shift_4_3_2_1_0(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t shift_value = extract_shift_4_3_2_1_0(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rt = GPR(copy(rt_value));
     std::string rs = GPR(copy(rs_value));
@@ -12686,11 +12686,11 @@ std::string NMD::ROTR(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::ROTRV(uint64 instruction)
+std::string NMD::ROTRV(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 rd_value = extract_rd_20_19_18_17_16(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t rd_value = extract_rd_20_19_18_17_16(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rd = GPR(copy(rd_value));
     std::string rs = GPR(copy(rs_value));
@@ -12710,13 +12710,13 @@ std::string NMD::ROTRV(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::ROTX(uint64 instruction)
+std::string NMD::ROTX(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 shift_value = extract_shift_4_3_2_1_0(instruction);
-    uint64 shiftx_value = extr_shiftxil7il1bs4Fmsb4(instruction);
-    uint64 stripe_value = extract_stripe_6(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t shift_value = extract_shift_4_3_2_1_0(instruction);
+    uint64_t shiftx_value = extr_shiftxil7il1bs4Fmsb4(instruction);
+    uint64_t stripe_value = extract_stripe_6(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rt = GPR(copy(rt_value));
     std::string rs = GPR(copy(rs_value));
@@ -12739,10 +12739,10 @@ std::string NMD::ROTX(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::ROUND_L_D(uint64 instruction)
+std::string NMD::ROUND_L_D(uint64_t instruction)
 {
-    uint64 fs_value = extract_fs_15_14_13_12_11(instruction);
-    uint64 ft_value = extract_ft_20_19_18_17_16(instruction);
+    uint64_t fs_value = extract_fs_15_14_13_12_11(instruction);
+    uint64_t ft_value = extract_ft_20_19_18_17_16(instruction);
 
     std::string ft = FPR(copy(ft_value));
     std::string fs = FPR(copy(fs_value));
@@ -12761,10 +12761,10 @@ std::string NMD::ROUND_L_D(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::ROUND_L_S(uint64 instruction)
+std::string NMD::ROUND_L_S(uint64_t instruction)
 {
-    uint64 fs_value = extract_fs_15_14_13_12_11(instruction);
-    uint64 ft_value = extract_ft_20_19_18_17_16(instruction);
+    uint64_t fs_value = extract_fs_15_14_13_12_11(instruction);
+    uint64_t ft_value = extract_ft_20_19_18_17_16(instruction);
 
     std::string ft = FPR(copy(ft_value));
     std::string fs = FPR(copy(fs_value));
@@ -12783,10 +12783,10 @@ std::string NMD::ROUND_L_S(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::ROUND_W_D(uint64 instruction)
+std::string NMD::ROUND_W_D(uint64_t instruction)
 {
-    uint64 fs_value = extract_fs_15_14_13_12_11(instruction);
-    uint64 ft_value = extract_ft_20_19_18_17_16(instruction);
+    uint64_t fs_value = extract_fs_15_14_13_12_11(instruction);
+    uint64_t ft_value = extract_ft_20_19_18_17_16(instruction);
 
     std::string ft = FPR(copy(ft_value));
     std::string fs = FPR(copy(fs_value));
@@ -12805,10 +12805,10 @@ std::string NMD::ROUND_W_D(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::ROUND_W_S(uint64 instruction)
+std::string NMD::ROUND_W_S(uint64_t instruction)
 {
-    uint64 fs_value = extract_fs_15_14_13_12_11(instruction);
-    uint64 ft_value = extract_ft_20_19_18_17_16(instruction);
+    uint64_t fs_value = extract_fs_15_14_13_12_11(instruction);
+    uint64_t ft_value = extract_ft_20_19_18_17_16(instruction);
 
     std::string ft = FPR(copy(ft_value));
     std::string fs = FPR(copy(fs_value));
@@ -12827,10 +12827,10 @@ std::string NMD::ROUND_W_S(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::RSQRT_D(uint64 instruction)
+std::string NMD::RSQRT_D(uint64_t instruction)
 {
-    uint64 fs_value = extract_fs_15_14_13_12_11(instruction);
-    uint64 ft_value = extract_ft_20_19_18_17_16(instruction);
+    uint64_t fs_value = extract_fs_15_14_13_12_11(instruction);
+    uint64_t ft_value = extract_ft_20_19_18_17_16(instruction);
 
     std::string ft = FPR(copy(ft_value));
     std::string fs = FPR(copy(fs_value));
@@ -12849,10 +12849,10 @@ std::string NMD::RSQRT_D(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::RSQRT_S(uint64 instruction)
+std::string NMD::RSQRT_S(uint64_t instruction)
 {
-    uint64 fs_value = extract_fs_15_14_13_12_11(instruction);
-    uint64 ft_value = extract_ft_20_19_18_17_16(instruction);
+    uint64_t fs_value = extract_fs_15_14_13_12_11(instruction);
+    uint64_t ft_value = extract_ft_20_19_18_17_16(instruction);
 
     std::string ft = FPR(copy(ft_value));
     std::string fs = FPR(copy(fs_value));
@@ -12871,11 +12871,11 @@ std::string NMD::RSQRT_S(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::SAVE_16_(uint64 instruction)
+std::string NMD::SAVE_16_(uint64_t instruction)
 {
-    uint64 count_value = extract_count_3_2_1_0(instruction);
-    uint64 rt1_value = extract_rtl_11(instruction);
-    uint64 u_value = extr_uil4il4bs4Fmsb7(instruction);
+    uint64_t count_value = extract_count_3_2_1_0(instruction);
+    uint64_t rt1_value = extract_rtl_11(instruction);
+    uint64_t u_value = extr_uil4il4bs4Fmsb7(instruction);
 
     std::string u = IMMEDIATE(copy(u_value));
     return img::format("SAVE %s%s", u,
@@ -12893,12 +12893,12 @@ std::string NMD::SAVE_16_(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::SAVE_32_(uint64 instruction)
+std::string NMD::SAVE_32_(uint64_t instruction)
 {
-    uint64 count_value = extract_count_19_18_17_16(instruction);
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 u_value = extr_uil3il3bs9Fmsb11(instruction);
-    uint64 gp_value = extract_gp_2(instruction);
+    uint64_t count_value = extract_count_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t u_value = extr_uil3il3bs9Fmsb11(instruction);
+    uint64_t gp_value = extract_gp_2(instruction);
 
     std::string u = IMMEDIATE(copy(u_value));
     return img::format("SAVE %s%s", u,
@@ -12916,10 +12916,10 @@ std::string NMD::SAVE_32_(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::SAVEF(uint64 instruction)
+std::string NMD::SAVEF(uint64_t instruction)
 {
-    uint64 count_value = extract_count_19_18_17_16(instruction);
-    uint64 u_value = extr_uil3il3bs9Fmsb11(instruction);
+    uint64_t count_value = extract_count_19_18_17_16(instruction);
+    uint64_t u_value = extr_uil3il3bs9Fmsb11(instruction);
 
     std::string u = IMMEDIATE(copy(u_value));
     std::string count = IMMEDIATE(copy(count_value));
@@ -12938,11 +12938,11 @@ std::string NMD::SAVEF(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::SB_16_(uint64 instruction)
+std::string NMD::SB_16_(uint64_t instruction)
 {
-    uint64 rtz3_value = extract_rtz3_9_8_7(instruction);
-    uint64 u_value = extract_u_1_0(instruction);
-    uint64 rs3_value = extract_rs3_6_5_4(instruction);
+    uint64_t rtz3_value = extract_rtz3_9_8_7(instruction);
+    uint64_t u_value = extract_u_1_0(instruction);
+    uint64_t rs3_value = extract_rs3_6_5_4(instruction);
 
     std::string rtz3 = GPR(encode_gpr3_store(rtz3_value));
     std::string u = IMMEDIATE(copy(u_value));
@@ -12962,10 +12962,10 @@ std::string NMD::SB_16_(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::SB_GP_(uint64 instruction)
+std::string NMD::SB_GP_(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 u_value = extract_u_17_to_0(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t u_value = extract_u_17_to_0(instruction);
 
     std::string rt = GPR(copy(rt_value));
     std::string u = IMMEDIATE(copy(u_value));
@@ -12984,11 +12984,11 @@ std::string NMD::SB_GP_(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::SB_S9_(uint64 instruction)
+std::string NMD::SB_S9_(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    int64 s_value = extr_sil0il0bs8_il15il8bs1Tmsb8(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    int64_t s_value = extr_sil0il0bs8_il15il8bs1Tmsb8(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rt = GPR(copy(rt_value));
     std::string s = IMMEDIATE(copy(s_value));
@@ -13008,11 +13008,11 @@ std::string NMD::SB_S9_(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::SB_U12_(uint64 instruction)
+std::string NMD::SB_U12_(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 u_value = extract_u_11_10_9_8_7_6_5_4_3_2_1_0(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t u_value = extract_u_11_10_9_8_7_6_5_4_3_2_1_0(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rt = GPR(copy(rt_value));
     std::string u = IMMEDIATE(copy(u_value));
@@ -13032,11 +13032,11 @@ std::string NMD::SB_U12_(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::SBE(uint64 instruction)
+std::string NMD::SBE(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    int64 s_value = extr_sil0il0bs8_il15il8bs1Tmsb8(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    int64_t s_value = extr_sil0il0bs8_il15il8bs1Tmsb8(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rt = GPR(copy(rt_value));
     std::string s = IMMEDIATE(copy(s_value));
@@ -13056,11 +13056,11 @@ std::string NMD::SBE(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::SBX(uint64 instruction)
+std::string NMD::SBX(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 rd_value = extract_rd_20_19_18_17_16(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t rd_value = extract_rd_20_19_18_17_16(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rd = GPR(copy(rd_value));
     std::string rs = GPR(copy(rs_value));
@@ -13080,11 +13080,11 @@ std::string NMD::SBX(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::SC(uint64 instruction)
+std::string NMD::SC(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    int64 s_value = extr_sil2il2bs6_il15il8bs1Tmsb8(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    int64_t s_value = extr_sil2il2bs6_il15il8bs1Tmsb8(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rt = GPR(copy(rt_value));
     std::string s = IMMEDIATE(copy(s_value));
@@ -13104,11 +13104,11 @@ std::string NMD::SC(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::SCD(uint64 instruction)
+std::string NMD::SCD(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    int64 s_value = extr_sil3il3bs5_il15il8bs1Tmsb8(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    int64_t s_value = extr_sil3il3bs5_il15il8bs1Tmsb8(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rt = GPR(copy(rt_value));
     std::string s = IMMEDIATE(copy(s_value));
@@ -13128,11 +13128,11 @@ std::string NMD::SCD(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::SCDP(uint64 instruction)
+std::string NMD::SCDP(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 ru_value = extract_ru_7_6_5_4_3(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t ru_value = extract_ru_7_6_5_4_3(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rt = GPR(copy(rt_value));
     std::string ru = GPR(copy(ru_value));
@@ -13152,11 +13152,11 @@ std::string NMD::SCDP(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::SCE(uint64 instruction)
+std::string NMD::SCE(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    int64 s_value = extr_sil2il2bs6_il15il8bs1Tmsb8(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    int64_t s_value = extr_sil2il2bs6_il15il8bs1Tmsb8(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rt = GPR(copy(rt_value));
     std::string s = IMMEDIATE(copy(s_value));
@@ -13176,11 +13176,11 @@ std::string NMD::SCE(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::SCWP(uint64 instruction)
+std::string NMD::SCWP(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 ru_value = extract_ru_7_6_5_4_3(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t ru_value = extract_ru_7_6_5_4_3(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rt = GPR(copy(rt_value));
     std::string ru = GPR(copy(ru_value));
@@ -13200,11 +13200,11 @@ std::string NMD::SCWP(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::SCWPE(uint64 instruction)
+std::string NMD::SCWPE(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 ru_value = extract_ru_7_6_5_4_3(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t ru_value = extract_ru_7_6_5_4_3(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rt = GPR(copy(rt_value));
     std::string ru = GPR(copy(ru_value));
@@ -13224,10 +13224,10 @@ std::string NMD::SCWPE(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::SD_GP_(uint64 instruction)
+std::string NMD::SD_GP_(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 u_value = extr_uil3il3bs18Fmsb20(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t u_value = extr_uil3il3bs18Fmsb20(instruction);
 
     std::string rt = GPR(copy(rt_value));
     std::string u = IMMEDIATE(copy(u_value));
@@ -13246,11 +13246,11 @@ std::string NMD::SD_GP_(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::SD_S9_(uint64 instruction)
+std::string NMD::SD_S9_(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    int64 s_value = extr_sil0il0bs8_il15il8bs1Tmsb8(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    int64_t s_value = extr_sil0il0bs8_il15il8bs1Tmsb8(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rt = GPR(copy(rt_value));
     std::string s = IMMEDIATE(copy(s_value));
@@ -13270,11 +13270,11 @@ std::string NMD::SD_S9_(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::SD_U12_(uint64 instruction)
+std::string NMD::SD_U12_(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 u_value = extract_u_11_10_9_8_7_6_5_4_3_2_1_0(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t u_value = extract_u_11_10_9_8_7_6_5_4_3_2_1_0(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rt = GPR(copy(rt_value));
     std::string u = IMMEDIATE(copy(u_value));
@@ -13294,9 +13294,9 @@ std::string NMD::SD_U12_(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::SDBBP_16_(uint64 instruction)
+std::string NMD::SDBBP_16_(uint64_t instruction)
 {
-    uint64 code_value = extract_code_2_1_0(instruction);
+    uint64_t code_value = extract_code_2_1_0(instruction);
 
     std::string code = IMMEDIATE(copy(code_value));
 
@@ -13314,9 +13314,9 @@ std::string NMD::SDBBP_16_(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::SDBBP_32_(uint64 instruction)
+std::string NMD::SDBBP_32_(uint64_t instruction)
 {
-    uint64 code_value = extract_code_18_to_0(instruction);
+    uint64_t code_value = extract_code_18_to_0(instruction);
 
     std::string code = IMMEDIATE(copy(code_value));
 
@@ -13334,10 +13334,10 @@ std::string NMD::SDBBP_32_(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::SDC1_GP_(uint64 instruction)
+std::string NMD::SDC1_GP_(uint64_t instruction)
 {
-    uint64 ft_value = extract_ft_20_19_18_17_16(instruction);
-    uint64 u_value = extr_uil2il2bs16Fmsb17(instruction);
+    uint64_t ft_value = extract_ft_20_19_18_17_16(instruction);
+    uint64_t u_value = extr_uil2il2bs16Fmsb17(instruction);
 
     std::string ft = FPR(copy(ft_value));
     std::string u = IMMEDIATE(copy(u_value));
@@ -13356,11 +13356,11 @@ std::string NMD::SDC1_GP_(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::SDC1_S9_(uint64 instruction)
+std::string NMD::SDC1_S9_(uint64_t instruction)
 {
-    int64 s_value = extr_sil0il0bs8_il15il8bs1Tmsb8(instruction);
-    uint64 ft_value = extract_ft_20_19_18_17_16(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    int64_t s_value = extr_sil0il0bs8_il15il8bs1Tmsb8(instruction);
+    uint64_t ft_value = extract_ft_20_19_18_17_16(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string ft = FPR(copy(ft_value));
     std::string s = IMMEDIATE(copy(s_value));
@@ -13380,11 +13380,11 @@ std::string NMD::SDC1_S9_(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::SDC1_U12_(uint64 instruction)
+std::string NMD::SDC1_U12_(uint64_t instruction)
 {
-    uint64 ft_value = extract_ft_20_19_18_17_16(instruction);
-    uint64 u_value = extract_u_11_10_9_8_7_6_5_4_3_2_1_0(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t ft_value = extract_ft_20_19_18_17_16(instruction);
+    uint64_t u_value = extract_u_11_10_9_8_7_6_5_4_3_2_1_0(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string ft = FPR(copy(ft_value));
     std::string u = IMMEDIATE(copy(u_value));
@@ -13404,11 +13404,11 @@ std::string NMD::SDC1_U12_(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::SDC1X(uint64 instruction)
+std::string NMD::SDC1X(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 ft_value = extract_ft_15_14_13_12_11(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t ft_value = extract_ft_15_14_13_12_11(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string ft = FPR(copy(ft_value));
     std::string rs = GPR(copy(rs_value));
@@ -13428,11 +13428,11 @@ std::string NMD::SDC1X(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::SDC1XS(uint64 instruction)
+std::string NMD::SDC1XS(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 ft_value = extract_ft_15_14_13_12_11(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t ft_value = extract_ft_15_14_13_12_11(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string ft = FPR(copy(ft_value));
     std::string rs = GPR(copy(rs_value));
@@ -13452,11 +13452,11 @@ std::string NMD::SDC1XS(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::SDC2(uint64 instruction)
+std::string NMD::SDC2(uint64_t instruction)
 {
-    uint64 cs_value = extract_cs_25_24_23_22_21(instruction);
-    int64 s_value = extr_sil0il0bs8_il15il8bs1Tmsb8(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t cs_value = extract_cs_25_24_23_22_21(instruction);
+    int64_t s_value = extr_sil0il0bs8_il15il8bs1Tmsb8(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string cs = CPR(copy(cs_value));
     std::string s = IMMEDIATE(copy(s_value));
@@ -13476,12 +13476,12 @@ std::string NMD::SDC2(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::SDM(uint64 instruction)
+std::string NMD::SDM(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 count3_value = extract_count3_14_13_12(instruction);
-    int64 s_value = extr_sil0il0bs8_il15il8bs1Tmsb8(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t count3_value = extract_count3_14_13_12(instruction);
+    int64_t s_value = extr_sil0il0bs8_il15il8bs1Tmsb8(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rt = GPR(copy(rt_value));
     std::string s = IMMEDIATE(copy(s_value));
@@ -13502,10 +13502,10 @@ std::string NMD::SDM(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::SDPC_48_(uint64 instruction)
+std::string NMD::SDPC_48_(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_41_40_39_38_37(instruction);
-    int64 s_value = extr_sil0il16bs16_il16il0bs16Tmsb31(instruction);
+    uint64_t rt_value = extract_rt_41_40_39_38_37(instruction);
+    int64_t s_value = extr_sil0il16bs16_il16il0bs16Tmsb31(instruction);
 
     std::string rt = GPR(copy(rt_value));
     std::string s = ADDRESS(encode_s_from_address(s_value), 6);
@@ -13524,11 +13524,11 @@ std::string NMD::SDPC_48_(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::SDXS(uint64 instruction)
+std::string NMD::SDXS(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 rd_value = extract_rd_20_19_18_17_16(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t rd_value = extract_rd_20_19_18_17_16(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rd = GPR(copy(rd_value));
     std::string rs = GPR(copy(rs_value));
@@ -13548,11 +13548,11 @@ std::string NMD::SDXS(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::SDX(uint64 instruction)
+std::string NMD::SDX(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 rd_value = extract_rd_20_19_18_17_16(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t rd_value = extract_rd_20_19_18_17_16(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rd = GPR(copy(rd_value));
     std::string rs = GPR(copy(rs_value));
@@ -13572,10 +13572,10 @@ std::string NMD::SDX(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::SEB(uint64 instruction)
+std::string NMD::SEB(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rt = GPR(copy(rt_value));
     std::string rs = GPR(copy(rs_value));
@@ -13594,10 +13594,10 @@ std::string NMD::SEB(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::SEH(uint64 instruction)
+std::string NMD::SEH(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rt = GPR(copy(rt_value));
     std::string rs = GPR(copy(rs_value));
@@ -13616,11 +13616,11 @@ std::string NMD::SEH(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::SEL_D(uint64 instruction)
+std::string NMD::SEL_D(uint64_t instruction)
 {
-    uint64 fs_value = extract_fs_15_14_13_12_11(instruction);
-    uint64 ft_value = extract_ft_20_19_18_17_16(instruction);
-    uint64 fd_value = extract_fd_10_9_8_7_6(instruction);
+    uint64_t fs_value = extract_fs_15_14_13_12_11(instruction);
+    uint64_t ft_value = extract_ft_20_19_18_17_16(instruction);
+    uint64_t fd_value = extract_fd_10_9_8_7_6(instruction);
 
     std::string fd = FPR(copy(fd_value));
     std::string fs = FPR(copy(fs_value));
@@ -13640,11 +13640,11 @@ std::string NMD::SEL_D(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::SEL_S(uint64 instruction)
+std::string NMD::SEL_S(uint64_t instruction)
 {
-    uint64 fs_value = extract_fs_15_14_13_12_11(instruction);
-    uint64 ft_value = extract_ft_20_19_18_17_16(instruction);
-    uint64 fd_value = extract_fd_10_9_8_7_6(instruction);
+    uint64_t fs_value = extract_fs_15_14_13_12_11(instruction);
+    uint64_t ft_value = extract_ft_20_19_18_17_16(instruction);
+    uint64_t fd_value = extract_fd_10_9_8_7_6(instruction);
 
     std::string fd = FPR(copy(fd_value));
     std::string fs = FPR(copy(fs_value));
@@ -13664,11 +13664,11 @@ std::string NMD::SEL_S(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::SELEQZ_D(uint64 instruction)
+std::string NMD::SELEQZ_D(uint64_t instruction)
 {
-    uint64 fs_value = extract_fs_15_14_13_12_11(instruction);
-    uint64 ft_value = extract_ft_20_19_18_17_16(instruction);
-    uint64 fd_value = extract_fd_10_9_8_7_6(instruction);
+    uint64_t fs_value = extract_fs_15_14_13_12_11(instruction);
+    uint64_t ft_value = extract_ft_20_19_18_17_16(instruction);
+    uint64_t fd_value = extract_fd_10_9_8_7_6(instruction);
 
     std::string fd = FPR(copy(fd_value));
     std::string fs = FPR(copy(fs_value));
@@ -13688,11 +13688,11 @@ std::string NMD::SELEQZ_D(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::SELEQZ_S(uint64 instruction)
+std::string NMD::SELEQZ_S(uint64_t instruction)
 {
-    uint64 fs_value = extract_fs_15_14_13_12_11(instruction);
-    uint64 ft_value = extract_ft_20_19_18_17_16(instruction);
-    uint64 fd_value = extract_fd_10_9_8_7_6(instruction);
+    uint64_t fs_value = extract_fs_15_14_13_12_11(instruction);
+    uint64_t ft_value = extract_ft_20_19_18_17_16(instruction);
+    uint64_t fd_value = extract_fd_10_9_8_7_6(instruction);
 
     std::string fd = FPR(copy(fd_value));
     std::string fs = FPR(copy(fs_value));
@@ -13712,11 +13712,11 @@ std::string NMD::SELEQZ_S(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::SELNEZ_D(uint64 instruction)
+std::string NMD::SELNEZ_D(uint64_t instruction)
 {
-    uint64 fs_value = extract_fs_15_14_13_12_11(instruction);
-    uint64 ft_value = extract_ft_20_19_18_17_16(instruction);
-    uint64 fd_value = extract_fd_10_9_8_7_6(instruction);
+    uint64_t fs_value = extract_fs_15_14_13_12_11(instruction);
+    uint64_t ft_value = extract_ft_20_19_18_17_16(instruction);
+    uint64_t fd_value = extract_fd_10_9_8_7_6(instruction);
 
     std::string fd = FPR(copy(fd_value));
     std::string fs = FPR(copy(fs_value));
@@ -13736,11 +13736,11 @@ std::string NMD::SELNEZ_D(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::SELNEZ_S(uint64 instruction)
+std::string NMD::SELNEZ_S(uint64_t instruction)
 {
-    uint64 fs_value = extract_fs_15_14_13_12_11(instruction);
-    uint64 ft_value = extract_ft_20_19_18_17_16(instruction);
-    uint64 fd_value = extract_fd_10_9_8_7_6(instruction);
+    uint64_t fs_value = extract_fs_15_14_13_12_11(instruction);
+    uint64_t ft_value = extract_ft_20_19_18_17_16(instruction);
+    uint64_t fd_value = extract_fd_10_9_8_7_6(instruction);
 
     std::string fd = FPR(copy(fd_value));
     std::string fs = FPR(copy(fs_value));
@@ -13760,11 +13760,11 @@ std::string NMD::SELNEZ_S(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::SEQI(uint64 instruction)
+std::string NMD::SEQI(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 u_value = extract_u_11_10_9_8_7_6_5_4_3_2_1_0(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t u_value = extract_u_11_10_9_8_7_6_5_4_3_2_1_0(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rt = GPR(copy(rt_value));
     std::string rs = GPR(copy(rs_value));
@@ -13784,11 +13784,11 @@ std::string NMD::SEQI(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::SH_16_(uint64 instruction)
+std::string NMD::SH_16_(uint64_t instruction)
 {
-    uint64 rtz3_value = extract_rtz3_9_8_7(instruction);
-    uint64 u_value = extr_uil1il1bs2Fmsb2(instruction);
-    uint64 rs3_value = extract_rs3_6_5_4(instruction);
+    uint64_t rtz3_value = extract_rtz3_9_8_7(instruction);
+    uint64_t u_value = extr_uil1il1bs2Fmsb2(instruction);
+    uint64_t rs3_value = extract_rs3_6_5_4(instruction);
 
     std::string rtz3 = GPR(encode_gpr3_store(rtz3_value));
     std::string u = IMMEDIATE(copy(u_value));
@@ -13808,10 +13808,10 @@ std::string NMD::SH_16_(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::SH_GP_(uint64 instruction)
+std::string NMD::SH_GP_(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 u_value = extr_uil1il1bs17Fmsb17(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t u_value = extr_uil1il1bs17Fmsb17(instruction);
 
     std::string rt = GPR(copy(rt_value));
     std::string u = IMMEDIATE(copy(u_value));
@@ -13830,11 +13830,11 @@ std::string NMD::SH_GP_(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::SH_S9_(uint64 instruction)
+std::string NMD::SH_S9_(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    int64 s_value = extr_sil0il0bs8_il15il8bs1Tmsb8(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    int64_t s_value = extr_sil0il0bs8_il15il8bs1Tmsb8(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rt = GPR(copy(rt_value));
     std::string s = IMMEDIATE(copy(s_value));
@@ -13854,11 +13854,11 @@ std::string NMD::SH_S9_(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::SH_U12_(uint64 instruction)
+std::string NMD::SH_U12_(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 u_value = extract_u_11_10_9_8_7_6_5_4_3_2_1_0(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t u_value = extract_u_11_10_9_8_7_6_5_4_3_2_1_0(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rt = GPR(copy(rt_value));
     std::string u = IMMEDIATE(copy(u_value));
@@ -13878,11 +13878,11 @@ std::string NMD::SH_U12_(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::SHE(uint64 instruction)
+std::string NMD::SHE(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    int64 s_value = extr_sil0il0bs8_il15il8bs1Tmsb8(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    int64_t s_value = extr_sil0il0bs8_il15il8bs1Tmsb8(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rt = GPR(copy(rt_value));
     std::string s = IMMEDIATE(copy(s_value));
@@ -13902,10 +13902,10 @@ std::string NMD::SHE(uint64 instruction)
  *      shift ------
  *               ac --
  */
-std::string NMD::SHILO(uint64 instruction)
+std::string NMD::SHILO(uint64_t instruction)
 {
-    int64 shift_value = extract_shift_21_20_19_18_17_16(instruction);
-    uint64 ac_value = extract_ac_13_12(instruction);
+    int64_t shift_value = extract_shift_21_20_19_18_17_16(instruction);
+    uint64_t ac_value = extract_ac_13_12(instruction);
 
     std::string shift = IMMEDIATE(copy(shift_value));
     std::string ac = AC(copy(ac_value));
@@ -13924,10 +13924,10 @@ std::string NMD::SHILO(uint64 instruction)
  *          rs -----
  *               ac --
  */
-std::string NMD::SHILOV(uint64 instruction)
+std::string NMD::SHILOV(uint64_t instruction)
 {
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
-    uint64 ac_value = extract_ac_13_12(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t ac_value = extract_ac_13_12(instruction);
 
     std::string rs = GPR(copy(rs_value));
     std::string ac = AC(copy(ac_value));
@@ -13946,11 +13946,11 @@ std::string NMD::SHILOV(uint64 instruction)
  *          rs -----
  *               sa ----
  */
-std::string NMD::SHLL_PH(uint64 instruction)
+std::string NMD::SHLL_PH(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
-    uint64 sa_value = extract_sa_15_14_13_12(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t sa_value = extract_sa_15_14_13_12(instruction);
 
     std::string rt = GPR(copy(rt_value));
     std::string rs = GPR(copy(rs_value));
@@ -13970,11 +13970,11 @@ std::string NMD::SHLL_PH(uint64 instruction)
  *          rs -----
  *               sa ---
  */
-std::string NMD::SHLL_QB(uint64 instruction)
+std::string NMD::SHLL_QB(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
-    uint64 sa_value = extract_sa_15_14_13(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t sa_value = extract_sa_15_14_13(instruction);
 
     std::string rt = GPR(copy(rt_value));
     std::string rs = GPR(copy(rs_value));
@@ -13994,11 +13994,11 @@ std::string NMD::SHLL_QB(uint64 instruction)
  *          rs -----
  *               sa ----
  */
-std::string NMD::SHLL_S_PH(uint64 instruction)
+std::string NMD::SHLL_S_PH(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
-    uint64 sa_value = extract_sa_15_14_13_12(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t sa_value = extract_sa_15_14_13_12(instruction);
 
     std::string rt = GPR(copy(rt_value));
     std::string rs = GPR(copy(rs_value));
@@ -14018,11 +14018,11 @@ std::string NMD::SHLL_S_PH(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::SHLL_S_W(uint64 instruction)
+std::string NMD::SHLL_S_W(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 sa_value = extract_sa_15_14_13_12_11(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t sa_value = extract_sa_15_14_13_12_11(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rt = GPR(copy(rt_value));
     std::string rs = GPR(copy(rs_value));
@@ -14042,11 +14042,11 @@ std::string NMD::SHLL_S_W(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::SHLLV_PH(uint64 instruction)
+std::string NMD::SHLLV_PH(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 rd_value = extract_rd_20_19_18_17_16(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t rd_value = extract_rd_20_19_18_17_16(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rd = GPR(copy(rd_value));
     std::string rt = GPR(copy(rt_value));
@@ -14066,11 +14066,11 @@ std::string NMD::SHLLV_PH(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::SHLLV_QB(uint64 instruction)
+std::string NMD::SHLLV_QB(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 rd_value = extract_rd_20_19_18_17_16(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t rd_value = extract_rd_20_19_18_17_16(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rd = GPR(copy(rd_value));
     std::string rt = GPR(copy(rt_value));
@@ -14090,11 +14090,11 @@ std::string NMD::SHLLV_QB(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::SHLLV_S_PH(uint64 instruction)
+std::string NMD::SHLLV_S_PH(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 rd_value = extract_rd_20_19_18_17_16(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t rd_value = extract_rd_20_19_18_17_16(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rd = GPR(copy(rd_value));
     std::string rt = GPR(copy(rt_value));
@@ -14114,11 +14114,11 @@ std::string NMD::SHLLV_S_PH(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::SHLLV_S_W(uint64 instruction)
+std::string NMD::SHLLV_S_W(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 rd_value = extract_rd_20_19_18_17_16(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t rd_value = extract_rd_20_19_18_17_16(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rd = GPR(copy(rd_value));
     std::string rt = GPR(copy(rt_value));
@@ -14138,11 +14138,11 @@ std::string NMD::SHLLV_S_W(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::SHRA_PH(uint64 instruction)
+std::string NMD::SHRA_PH(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 sa_value = extract_sa_15_14_13_12(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t sa_value = extract_sa_15_14_13_12(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rt = GPR(copy(rt_value));
     std::string rs = GPR(copy(rs_value));
@@ -14162,11 +14162,11 @@ std::string NMD::SHRA_PH(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::SHRA_QB(uint64 instruction)
+std::string NMD::SHRA_QB(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 sa_value = extract_sa_15_14_13(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t sa_value = extract_sa_15_14_13(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rt = GPR(copy(rt_value));
     std::string rs = GPR(copy(rs_value));
@@ -14186,11 +14186,11 @@ std::string NMD::SHRA_QB(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::SHRA_R_PH(uint64 instruction)
+std::string NMD::SHRA_R_PH(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 sa_value = extract_sa_15_14_13_12(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t sa_value = extract_sa_15_14_13_12(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rt = GPR(copy(rt_value));
     std::string rs = GPR(copy(rs_value));
@@ -14210,11 +14210,11 @@ std::string NMD::SHRA_R_PH(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::SHRA_R_QB(uint64 instruction)
+std::string NMD::SHRA_R_QB(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 sa_value = extract_sa_15_14_13(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t sa_value = extract_sa_15_14_13(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rt = GPR(copy(rt_value));
     std::string rs = GPR(copy(rs_value));
@@ -14234,11 +14234,11 @@ std::string NMD::SHRA_R_QB(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::SHRA_R_W(uint64 instruction)
+std::string NMD::SHRA_R_W(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 sa_value = extract_sa_15_14_13_12_11(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t sa_value = extract_sa_15_14_13_12_11(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rt = GPR(copy(rt_value));
     std::string rs = GPR(copy(rs_value));
@@ -14258,11 +14258,11 @@ std::string NMD::SHRA_R_W(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::SHRAV_PH(uint64 instruction)
+std::string NMD::SHRAV_PH(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 rd_value = extract_rd_20_19_18_17_16(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t rd_value = extract_rd_20_19_18_17_16(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rd = GPR(copy(rd_value));
     std::string rt = GPR(copy(rt_value));
@@ -14282,11 +14282,11 @@ std::string NMD::SHRAV_PH(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::SHRAV_QB(uint64 instruction)
+std::string NMD::SHRAV_QB(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 rd_value = extract_rd_20_19_18_17_16(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t rd_value = extract_rd_20_19_18_17_16(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rd = GPR(copy(rd_value));
     std::string rt = GPR(copy(rt_value));
@@ -14306,11 +14306,11 @@ std::string NMD::SHRAV_QB(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::SHRAV_R_PH(uint64 instruction)
+std::string NMD::SHRAV_R_PH(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 rd_value = extract_rd_20_19_18_17_16(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t rd_value = extract_rd_20_19_18_17_16(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rd = GPR(copy(rd_value));
     std::string rt = GPR(copy(rt_value));
@@ -14330,11 +14330,11 @@ std::string NMD::SHRAV_R_PH(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::SHRAV_R_QB(uint64 instruction)
+std::string NMD::SHRAV_R_QB(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 rd_value = extract_rd_20_19_18_17_16(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t rd_value = extract_rd_20_19_18_17_16(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rd = GPR(copy(rd_value));
     std::string rt = GPR(copy(rt_value));
@@ -14354,11 +14354,11 @@ std::string NMD::SHRAV_R_QB(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::SHRAV_R_W(uint64 instruction)
+std::string NMD::SHRAV_R_W(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 rd_value = extract_rd_20_19_18_17_16(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t rd_value = extract_rd_20_19_18_17_16(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rd = GPR(copy(rd_value));
     std::string rt = GPR(copy(rt_value));
@@ -14378,11 +14378,11 @@ std::string NMD::SHRAV_R_W(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::SHRL_PH(uint64 instruction)
+std::string NMD::SHRL_PH(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 sa_value = extract_sa_15_14_13_12(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t sa_value = extract_sa_15_14_13_12(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rt = GPR(copy(rt_value));
     std::string rs = GPR(copy(rs_value));
@@ -14402,11 +14402,11 @@ std::string NMD::SHRL_PH(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::SHRL_QB(uint64 instruction)
+std::string NMD::SHRL_QB(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 sa_value = extract_sa_15_14_13(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t sa_value = extract_sa_15_14_13(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rt = GPR(copy(rt_value));
     std::string rs = GPR(copy(rs_value));
@@ -14426,11 +14426,11 @@ std::string NMD::SHRL_QB(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::SHRLV_PH(uint64 instruction)
+std::string NMD::SHRLV_PH(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 rd_value = extract_rd_20_19_18_17_16(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t rd_value = extract_rd_20_19_18_17_16(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rd = GPR(copy(rd_value));
     std::string rt = GPR(copy(rt_value));
@@ -14450,11 +14450,11 @@ std::string NMD::SHRLV_PH(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::SHRLV_QB(uint64 instruction)
+std::string NMD::SHRLV_QB(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 rd_value = extract_rd_20_19_18_17_16(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t rd_value = extract_rd_20_19_18_17_16(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rd = GPR(copy(rd_value));
     std::string rt = GPR(copy(rt_value));
@@ -14474,11 +14474,11 @@ std::string NMD::SHRLV_QB(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::SHX(uint64 instruction)
+std::string NMD::SHX(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 rd_value = extract_rd_20_19_18_17_16(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t rd_value = extract_rd_20_19_18_17_16(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rd = GPR(copy(rd_value));
     std::string rs = GPR(copy(rs_value));
@@ -14498,11 +14498,11 @@ std::string NMD::SHX(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::SHXS(uint64 instruction)
+std::string NMD::SHXS(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 rd_value = extract_rd_20_19_18_17_16(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t rd_value = extract_rd_20_19_18_17_16(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rd = GPR(copy(rd_value));
     std::string rs = GPR(copy(rs_value));
@@ -14522,9 +14522,9 @@ std::string NMD::SHXS(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::SIGRIE(uint64 instruction)
+std::string NMD::SIGRIE(uint64_t instruction)
 {
-    uint64 code_value = extract_code_18_to_0(instruction);
+    uint64_t code_value = extract_code_18_to_0(instruction);
 
     std::string code = IMMEDIATE(copy(code_value));
 
@@ -14542,11 +14542,11 @@ std::string NMD::SIGRIE(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::SLL_16_(uint64 instruction)
+std::string NMD::SLL_16_(uint64_t instruction)
 {
-    uint64 shift3_value = extract_shift3_2_1_0(instruction);
-    uint64 rt3_value = extract_rt3_9_8_7(instruction);
-    uint64 rs3_value = extract_rs3_6_5_4(instruction);
+    uint64_t shift3_value = extract_shift3_2_1_0(instruction);
+    uint64_t rt3_value = extract_rt3_9_8_7(instruction);
+    uint64_t rs3_value = extract_rs3_6_5_4(instruction);
 
     std::string rt3 = GPR(encode_gpr3(rt3_value));
     std::string rs3 = GPR(encode_gpr3(rs3_value));
@@ -14566,11 +14566,11 @@ std::string NMD::SLL_16_(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::SLL_32_(uint64 instruction)
+std::string NMD::SLL_32_(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 shift_value = extract_shift_4_3_2_1_0(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t shift_value = extract_shift_4_3_2_1_0(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rt = GPR(copy(rt_value));
     std::string rs = GPR(copy(rs_value));
@@ -14590,11 +14590,11 @@ std::string NMD::SLL_32_(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::SLLV(uint64 instruction)
+std::string NMD::SLLV(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 rd_value = extract_rd_20_19_18_17_16(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t rd_value = extract_rd_20_19_18_17_16(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rd = GPR(copy(rd_value));
     std::string rs = GPR(copy(rs_value));
@@ -14614,11 +14614,11 @@ std::string NMD::SLLV(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::SLT(uint64 instruction)
+std::string NMD::SLT(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 rd_value = extract_rd_20_19_18_17_16(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t rd_value = extract_rd_20_19_18_17_16(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rd = GPR(copy(rd_value));
     std::string rs = GPR(copy(rs_value));
@@ -14638,11 +14638,11 @@ std::string NMD::SLT(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::SLTI(uint64 instruction)
+std::string NMD::SLTI(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 u_value = extract_u_11_10_9_8_7_6_5_4_3_2_1_0(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t u_value = extract_u_11_10_9_8_7_6_5_4_3_2_1_0(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rt = GPR(copy(rt_value));
     std::string rs = GPR(copy(rs_value));
@@ -14662,11 +14662,11 @@ std::string NMD::SLTI(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::SLTIU(uint64 instruction)
+std::string NMD::SLTIU(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 u_value = extract_u_11_10_9_8_7_6_5_4_3_2_1_0(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t u_value = extract_u_11_10_9_8_7_6_5_4_3_2_1_0(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rt = GPR(copy(rt_value));
     std::string rs = GPR(copy(rs_value));
@@ -14686,11 +14686,11 @@ std::string NMD::SLTIU(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::SLTU(uint64 instruction)
+std::string NMD::SLTU(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 rd_value = extract_rd_20_19_18_17_16(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t rd_value = extract_rd_20_19_18_17_16(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rd = GPR(copy(rd_value));
     std::string rs = GPR(copy(rs_value));
@@ -14710,11 +14710,11 @@ std::string NMD::SLTU(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::SOV(uint64 instruction)
+std::string NMD::SOV(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 rd_value = extract_rd_20_19_18_17_16(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t rd_value = extract_rd_20_19_18_17_16(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rd = GPR(copy(rd_value));
     std::string rs = GPR(copy(rs_value));
@@ -14734,9 +14734,9 @@ std::string NMD::SOV(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::SPECIAL2(uint64 instruction)
+std::string NMD::SPECIAL2(uint64_t instruction)
 {
-    uint64 op_value = extract_op_25_to_3(instruction);
+    uint64_t op_value = extract_op_25_to_3(instruction);
 
     std::string op = IMMEDIATE(copy(op_value));
 
@@ -14754,10 +14754,10 @@ std::string NMD::SPECIAL2(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::SQRT_D(uint64 instruction)
+std::string NMD::SQRT_D(uint64_t instruction)
 {
-    uint64 fs_value = extract_fs_15_14_13_12_11(instruction);
-    uint64 ft_value = extract_ft_20_19_18_17_16(instruction);
+    uint64_t fs_value = extract_fs_15_14_13_12_11(instruction);
+    uint64_t ft_value = extract_ft_20_19_18_17_16(instruction);
 
     std::string ft = FPR(copy(ft_value));
     std::string fs = FPR(copy(fs_value));
@@ -14776,10 +14776,10 @@ std::string NMD::SQRT_D(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::SQRT_S(uint64 instruction)
+std::string NMD::SQRT_S(uint64_t instruction)
 {
-    uint64 fs_value = extract_fs_15_14_13_12_11(instruction);
-    uint64 ft_value = extract_ft_20_19_18_17_16(instruction);
+    uint64_t fs_value = extract_fs_15_14_13_12_11(instruction);
+    uint64_t ft_value = extract_ft_20_19_18_17_16(instruction);
 
     std::string ft = FPR(copy(ft_value));
     std::string fs = FPR(copy(fs_value));
@@ -14798,11 +14798,11 @@ std::string NMD::SQRT_S(uint64 instruction)
  *               rd -----
  *                    sa -----
  */
-std::string NMD::SRA(uint64 instruction)
+std::string NMD::SRA(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
-    uint64 shift_value = extract_shift_4_3_2_1_0(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t shift_value = extract_shift_4_3_2_1_0(instruction);
 
     std::string rt = GPR(copy(rt_value));
     std::string rs = GPR(copy(rs_value));
@@ -14822,11 +14822,11 @@ std::string NMD::SRA(uint64 instruction)
  *          rt -----
  *               rd -----
  */
-std::string NMD::SRAV(uint64 instruction)
+std::string NMD::SRAV(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 rd_value = extract_rd_20_19_18_17_16(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t rd_value = extract_rd_20_19_18_17_16(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rd = GPR(copy(rd_value));
     std::string rs = GPR(copy(rs_value));
@@ -14846,11 +14846,11 @@ std::string NMD::SRAV(uint64 instruction)
  *          rt -----
  *               rd -----
  */
-std::string NMD::SRL_16_(uint64 instruction)
+std::string NMD::SRL_16_(uint64_t instruction)
 {
-    uint64 shift3_value = extract_shift3_2_1_0(instruction);
-    uint64 rt3_value = extract_rt3_9_8_7(instruction);
-    uint64 rs3_value = extract_rs3_6_5_4(instruction);
+    uint64_t shift3_value = extract_shift3_2_1_0(instruction);
+    uint64_t rt3_value = extract_rt3_9_8_7(instruction);
+    uint64_t rs3_value = extract_rs3_6_5_4(instruction);
 
     std::string rt3 = GPR(encode_gpr3(rt3_value));
     std::string rs3 = GPR(encode_gpr3(rs3_value));
@@ -14870,11 +14870,11 @@ std::string NMD::SRL_16_(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::SRL_32_(uint64 instruction)
+std::string NMD::SRL_32_(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 shift_value = extract_shift_4_3_2_1_0(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t shift_value = extract_shift_4_3_2_1_0(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rt = GPR(copy(rt_value));
     std::string rs = GPR(copy(rs_value));
@@ -14894,11 +14894,11 @@ std::string NMD::SRL_32_(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::SRLV(uint64 instruction)
+std::string NMD::SRLV(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 rd_value = extract_rd_20_19_18_17_16(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t rd_value = extract_rd_20_19_18_17_16(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rd = GPR(copy(rd_value));
     std::string rs = GPR(copy(rs_value));
@@ -14918,11 +14918,11 @@ std::string NMD::SRLV(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::SUB(uint64 instruction)
+std::string NMD::SUB(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 rd_value = extract_rd_20_19_18_17_16(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t rd_value = extract_rd_20_19_18_17_16(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rd = GPR(copy(rd_value));
     std::string rs = GPR(copy(rs_value));
@@ -14942,11 +14942,11 @@ std::string NMD::SUB(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::SUB_D(uint64 instruction)
+std::string NMD::SUB_D(uint64_t instruction)
 {
-    uint64 fs_value = extract_fs_15_14_13_12_11(instruction);
-    uint64 ft_value = extract_ft_20_19_18_17_16(instruction);
-    uint64 fd_value = extract_fd_10_9_8_7_6(instruction);
+    uint64_t fs_value = extract_fs_15_14_13_12_11(instruction);
+    uint64_t ft_value = extract_ft_20_19_18_17_16(instruction);
+    uint64_t fd_value = extract_fd_10_9_8_7_6(instruction);
 
     std::string fd = FPR(copy(fd_value));
     std::string fs = FPR(copy(fs_value));
@@ -14966,11 +14966,11 @@ std::string NMD::SUB_D(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::SUB_S(uint64 instruction)
+std::string NMD::SUB_S(uint64_t instruction)
 {
-    uint64 fs_value = extract_fs_15_14_13_12_11(instruction);
-    uint64 ft_value = extract_ft_20_19_18_17_16(instruction);
-    uint64 fd_value = extract_fd_10_9_8_7_6(instruction);
+    uint64_t fs_value = extract_fs_15_14_13_12_11(instruction);
+    uint64_t ft_value = extract_ft_20_19_18_17_16(instruction);
+    uint64_t fd_value = extract_fd_10_9_8_7_6(instruction);
 
     std::string fd = FPR(copy(fd_value));
     std::string fs = FPR(copy(fs_value));
@@ -14990,11 +14990,11 @@ std::string NMD::SUB_S(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::SUBQ_PH(uint64 instruction)
+std::string NMD::SUBQ_PH(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 rd_value = extract_rd_20_19_18_17_16(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t rd_value = extract_rd_20_19_18_17_16(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rd = GPR(copy(rd_value));
     std::string rs = GPR(copy(rs_value));
@@ -15015,11 +15015,11 @@ std::string NMD::SUBQ_PH(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::SUBQ_S_PH(uint64 instruction)
+std::string NMD::SUBQ_S_PH(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 rd_value = extract_rd_20_19_18_17_16(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t rd_value = extract_rd_20_19_18_17_16(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rd = GPR(copy(rd_value));
     std::string rs = GPR(copy(rs_value));
@@ -15040,11 +15040,11 @@ std::string NMD::SUBQ_S_PH(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::SUBQ_S_W(uint64 instruction)
+std::string NMD::SUBQ_S_W(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 rd_value = extract_rd_20_19_18_17_16(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t rd_value = extract_rd_20_19_18_17_16(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rd = GPR(copy(rd_value));
     std::string rs = GPR(copy(rs_value));
@@ -15065,11 +15065,11 @@ std::string NMD::SUBQ_S_W(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::SUBQH_PH(uint64 instruction)
+std::string NMD::SUBQH_PH(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 rd_value = extract_rd_20_19_18_17_16(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t rd_value = extract_rd_20_19_18_17_16(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rd = GPR(copy(rd_value));
     std::string rs = GPR(copy(rs_value));
@@ -15090,11 +15090,11 @@ std::string NMD::SUBQH_PH(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::SUBQH_R_PH(uint64 instruction)
+std::string NMD::SUBQH_R_PH(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 rd_value = extract_rd_20_19_18_17_16(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t rd_value = extract_rd_20_19_18_17_16(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rd = GPR(copy(rd_value));
     std::string rs = GPR(copy(rs_value));
@@ -15115,11 +15115,11 @@ std::string NMD::SUBQH_R_PH(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::SUBQH_R_W(uint64 instruction)
+std::string NMD::SUBQH_R_W(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 rd_value = extract_rd_20_19_18_17_16(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t rd_value = extract_rd_20_19_18_17_16(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rd = GPR(copy(rd_value));
     std::string rs = GPR(copy(rs_value));
@@ -15140,11 +15140,11 @@ std::string NMD::SUBQH_R_W(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::SUBQH_W(uint64 instruction)
+std::string NMD::SUBQH_W(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 rd_value = extract_rd_20_19_18_17_16(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t rd_value = extract_rd_20_19_18_17_16(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rd = GPR(copy(rd_value));
     std::string rs = GPR(copy(rs_value));
@@ -15164,11 +15164,11 @@ std::string NMD::SUBQH_W(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::SUBU_16_(uint64 instruction)
+std::string NMD::SUBU_16_(uint64_t instruction)
 {
-    uint64 rd3_value = extract_rd3_3_2_1(instruction);
-    uint64 rt3_value = extract_rt3_9_8_7(instruction);
-    uint64 rs3_value = extract_rs3_6_5_4(instruction);
+    uint64_t rd3_value = extract_rd3_3_2_1(instruction);
+    uint64_t rt3_value = extract_rt3_9_8_7(instruction);
+    uint64_t rs3_value = extract_rs3_6_5_4(instruction);
 
     std::string rd3 = GPR(encode_gpr3(rd3_value));
     std::string rs3 = GPR(encode_gpr3(rs3_value));
@@ -15188,11 +15188,11 @@ std::string NMD::SUBU_16_(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::SUBU_32_(uint64 instruction)
+std::string NMD::SUBU_32_(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 rd_value = extract_rd_20_19_18_17_16(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t rd_value = extract_rd_20_19_18_17_16(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rd = GPR(copy(rd_value));
     std::string rs = GPR(copy(rs_value));
@@ -15212,11 +15212,11 @@ std::string NMD::SUBU_32_(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::SUBU_PH(uint64 instruction)
+std::string NMD::SUBU_PH(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 rd_value = extract_rd_20_19_18_17_16(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t rd_value = extract_rd_20_19_18_17_16(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rd = GPR(copy(rd_value));
     std::string rs = GPR(copy(rs_value));
@@ -15236,11 +15236,11 @@ std::string NMD::SUBU_PH(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::SUBU_QB(uint64 instruction)
+std::string NMD::SUBU_QB(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 rd_value = extract_rd_20_19_18_17_16(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t rd_value = extract_rd_20_19_18_17_16(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rd = GPR(copy(rd_value));
     std::string rs = GPR(copy(rs_value));
@@ -15260,11 +15260,11 @@ std::string NMD::SUBU_QB(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::SUBU_S_PH(uint64 instruction)
+std::string NMD::SUBU_S_PH(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 rd_value = extract_rd_20_19_18_17_16(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t rd_value = extract_rd_20_19_18_17_16(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rd = GPR(copy(rd_value));
     std::string rs = GPR(copy(rs_value));
@@ -15284,11 +15284,11 @@ std::string NMD::SUBU_S_PH(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::SUBU_S_QB(uint64 instruction)
+std::string NMD::SUBU_S_QB(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 rd_value = extract_rd_20_19_18_17_16(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t rd_value = extract_rd_20_19_18_17_16(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rd = GPR(copy(rd_value));
     std::string rs = GPR(copy(rs_value));
@@ -15309,11 +15309,11 @@ std::string NMD::SUBU_S_QB(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::SUBUH_QB(uint64 instruction)
+std::string NMD::SUBUH_QB(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 rd_value = extract_rd_20_19_18_17_16(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t rd_value = extract_rd_20_19_18_17_16(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rd = GPR(copy(rd_value));
     std::string rs = GPR(copy(rs_value));
@@ -15334,11 +15334,11 @@ std::string NMD::SUBUH_QB(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::SUBUH_R_QB(uint64 instruction)
+std::string NMD::SUBUH_R_QB(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 rd_value = extract_rd_20_19_18_17_16(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t rd_value = extract_rd_20_19_18_17_16(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rd = GPR(copy(rd_value));
     std::string rs = GPR(copy(rs_value));
@@ -15358,11 +15358,11 @@ std::string NMD::SUBUH_R_QB(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::SW_16_(uint64 instruction)
+std::string NMD::SW_16_(uint64_t instruction)
 {
-    uint64 rtz3_value = extract_rtz3_9_8_7(instruction);
-    uint64 u_value = extr_uil0il2bs4Fmsb5(instruction);
-    uint64 rs3_value = extract_rs3_6_5_4(instruction);
+    uint64_t rtz3_value = extract_rtz3_9_8_7(instruction);
+    uint64_t u_value = extr_uil0il2bs4Fmsb5(instruction);
+    uint64_t rs3_value = extract_rs3_6_5_4(instruction);
 
     std::string rtz3 = GPR(encode_gpr3_store(rtz3_value));
     std::string u = IMMEDIATE(copy(u_value));
@@ -15382,11 +15382,11 @@ std::string NMD::SW_16_(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::SW_4X4_(uint64 instruction)
+std::string NMD::SW_4X4_(uint64_t instruction)
 {
-    uint64 rs4_value = extract_rs4_4_2_1_0(instruction);
-    uint64 rtz4_value = extract_rtz4_9_7_6_5(instruction);
-    uint64 u_value = extr_uil3il3bs1_il8il2bs1Fmsb3(instruction);
+    uint64_t rs4_value = extract_rs4_4_2_1_0(instruction);
+    uint64_t rtz4_value = extract_rtz4_9_7_6_5(instruction);
+    uint64_t u_value = extr_uil3il3bs1_il8il2bs1Fmsb3(instruction);
 
     std::string rtz4 = GPR(encode_gpr4_zero(rtz4_value));
     std::string u = IMMEDIATE(copy(u_value));
@@ -15406,10 +15406,10 @@ std::string NMD::SW_4X4_(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::SW_GP16_(uint64 instruction)
+std::string NMD::SW_GP16_(uint64_t instruction)
 {
-    uint64 rtz3_value = extract_rtz3_9_8_7(instruction);
-    uint64 u_value = extr_uil0il2bs7Fmsb8(instruction);
+    uint64_t rtz3_value = extract_rtz3_9_8_7(instruction);
+    uint64_t u_value = extr_uil0il2bs7Fmsb8(instruction);
 
     std::string rtz3 = GPR(encode_gpr3_store(rtz3_value));
     std::string u = IMMEDIATE(copy(u_value));
@@ -15428,10 +15428,10 @@ std::string NMD::SW_GP16_(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::SW_GP_(uint64 instruction)
+std::string NMD::SW_GP_(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 u_value = extr_uil2il2bs19Fmsb20(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t u_value = extr_uil2il2bs19Fmsb20(instruction);
 
     std::string rt = GPR(copy(rt_value));
     std::string u = IMMEDIATE(copy(u_value));
@@ -15450,11 +15450,11 @@ std::string NMD::SW_GP_(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::SW_S9_(uint64 instruction)
+std::string NMD::SW_S9_(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    int64 s_value = extr_sil0il0bs8_il15il8bs1Tmsb8(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    int64_t s_value = extr_sil0il0bs8_il15il8bs1Tmsb8(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rt = GPR(copy(rt_value));
     std::string s = IMMEDIATE(copy(s_value));
@@ -15474,10 +15474,10 @@ std::string NMD::SW_S9_(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::SW_SP_(uint64 instruction)
+std::string NMD::SW_SP_(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_9_8_7_6_5(instruction);
-    uint64 u_value = extr_uil0il2bs5Fmsb6(instruction);
+    uint64_t rt_value = extract_rt_9_8_7_6_5(instruction);
+    uint64_t u_value = extr_uil0il2bs5Fmsb6(instruction);
 
     std::string rt = GPR(copy(rt_value));
     std::string u = IMMEDIATE(copy(u_value));
@@ -15496,11 +15496,11 @@ std::string NMD::SW_SP_(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::SW_U12_(uint64 instruction)
+std::string NMD::SW_U12_(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 u_value = extract_u_11_10_9_8_7_6_5_4_3_2_1_0(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t u_value = extract_u_11_10_9_8_7_6_5_4_3_2_1_0(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rt = GPR(copy(rt_value));
     std::string u = IMMEDIATE(copy(u_value));
@@ -15520,10 +15520,10 @@ std::string NMD::SW_U12_(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::SWC1_GP_(uint64 instruction)
+std::string NMD::SWC1_GP_(uint64_t instruction)
 {
-    uint64 ft_value = extract_ft_20_19_18_17_16(instruction);
-    uint64 u_value = extr_uil2il2bs16Fmsb17(instruction);
+    uint64_t ft_value = extract_ft_20_19_18_17_16(instruction);
+    uint64_t u_value = extr_uil2il2bs16Fmsb17(instruction);
 
     std::string ft = FPR(copy(ft_value));
     std::string u = IMMEDIATE(copy(u_value));
@@ -15542,11 +15542,11 @@ std::string NMD::SWC1_GP_(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::SWC1_S9_(uint64 instruction)
+std::string NMD::SWC1_S9_(uint64_t instruction)
 {
-    int64 s_value = extr_sil0il0bs8_il15il8bs1Tmsb8(instruction);
-    uint64 ft_value = extract_ft_20_19_18_17_16(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    int64_t s_value = extr_sil0il0bs8_il15il8bs1Tmsb8(instruction);
+    uint64_t ft_value = extract_ft_20_19_18_17_16(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string ft = FPR(copy(ft_value));
     std::string s = IMMEDIATE(copy(s_value));
@@ -15566,11 +15566,11 @@ std::string NMD::SWC1_S9_(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::SWC1_U12_(uint64 instruction)
+std::string NMD::SWC1_U12_(uint64_t instruction)
 {
-    uint64 ft_value = extract_ft_20_19_18_17_16(instruction);
-    uint64 u_value = extract_u_11_10_9_8_7_6_5_4_3_2_1_0(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t ft_value = extract_ft_20_19_18_17_16(instruction);
+    uint64_t u_value = extract_u_11_10_9_8_7_6_5_4_3_2_1_0(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string ft = FPR(copy(ft_value));
     std::string u = IMMEDIATE(copy(u_value));
@@ -15590,11 +15590,11 @@ std::string NMD::SWC1_U12_(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::SWC1X(uint64 instruction)
+std::string NMD::SWC1X(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 ft_value = extract_ft_15_14_13_12_11(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t ft_value = extract_ft_15_14_13_12_11(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string ft = FPR(copy(ft_value));
     std::string rs = GPR(copy(rs_value));
@@ -15614,11 +15614,11 @@ std::string NMD::SWC1X(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::SWC1XS(uint64 instruction)
+std::string NMD::SWC1XS(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 ft_value = extract_ft_15_14_13_12_11(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t ft_value = extract_ft_15_14_13_12_11(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string ft = FPR(copy(ft_value));
     std::string rs = GPR(copy(rs_value));
@@ -15638,11 +15638,11 @@ std::string NMD::SWC1XS(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::SWC2(uint64 instruction)
+std::string NMD::SWC2(uint64_t instruction)
 {
-    uint64 cs_value = extract_cs_25_24_23_22_21(instruction);
-    int64 s_value = extr_sil0il0bs8_il15il8bs1Tmsb8(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t cs_value = extract_cs_25_24_23_22_21(instruction);
+    int64_t s_value = extr_sil0il0bs8_il15il8bs1Tmsb8(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string cs = CPR(copy(cs_value));
     std::string s = IMMEDIATE(copy(s_value));
@@ -15662,11 +15662,11 @@ std::string NMD::SWC2(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::SWE(uint64 instruction)
+std::string NMD::SWE(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    int64 s_value = extr_sil0il0bs8_il15il8bs1Tmsb8(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    int64_t s_value = extr_sil0il0bs8_il15il8bs1Tmsb8(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rt = GPR(copy(rt_value));
     std::string s = IMMEDIATE(copy(s_value));
@@ -15686,12 +15686,12 @@ std::string NMD::SWE(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::SWM(uint64 instruction)
+std::string NMD::SWM(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 count3_value = extract_count3_14_13_12(instruction);
-    int64 s_value = extr_sil0il0bs8_il15il8bs1Tmsb8(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t count3_value = extract_count3_14_13_12(instruction);
+    int64_t s_value = extr_sil0il0bs8_il15il8bs1Tmsb8(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rt = GPR(copy(rt_value));
     std::string s = IMMEDIATE(copy(s_value));
@@ -15712,10 +15712,10 @@ std::string NMD::SWM(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::SWPC_48_(uint64 instruction)
+std::string NMD::SWPC_48_(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_41_40_39_38_37(instruction);
-    int64 s_value = extr_sil0il16bs16_il16il0bs16Tmsb31(instruction);
+    uint64_t rt_value = extract_rt_41_40_39_38_37(instruction);
+    int64_t s_value = extr_sil0il16bs16_il16il0bs16Tmsb31(instruction);
 
     std::string rt = GPR(copy(rt_value));
     std::string s = ADDRESS(encode_s_from_address(s_value), 6);
@@ -15734,11 +15734,11 @@ std::string NMD::SWPC_48_(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::SWX(uint64 instruction)
+std::string NMD::SWX(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 rd_value = extract_rd_20_19_18_17_16(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t rd_value = extract_rd_20_19_18_17_16(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rd = GPR(copy(rd_value));
     std::string rs = GPR(copy(rs_value));
@@ -15758,11 +15758,11 @@ std::string NMD::SWX(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::SWXS(uint64 instruction)
+std::string NMD::SWXS(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 rd_value = extract_rd_20_19_18_17_16(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t rd_value = extract_rd_20_19_18_17_16(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rd = GPR(copy(rd_value));
     std::string rs = GPR(copy(rs_value));
@@ -15782,9 +15782,9 @@ std::string NMD::SWXS(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::SYNC(uint64 instruction)
+std::string NMD::SYNC(uint64_t instruction)
 {
-    uint64 stype_value = extract_stype_20_19_18_17_16(instruction);
+    uint64_t stype_value = extract_stype_20_19_18_17_16(instruction);
 
     std::string stype = IMMEDIATE(copy(stype_value));
 
@@ -15802,10 +15802,10 @@ std::string NMD::SYNC(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::SYNCI(uint64 instruction)
+std::string NMD::SYNCI(uint64_t instruction)
 {
-    int64 s_value = extr_sil0il0bs8_il15il8bs1Tmsb8(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    int64_t s_value = extr_sil0il0bs8_il15il8bs1Tmsb8(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string s = IMMEDIATE(copy(s_value));
     std::string rs = GPR(copy(rs_value));
@@ -15824,10 +15824,10 @@ std::string NMD::SYNCI(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::SYNCIE(uint64 instruction)
+std::string NMD::SYNCIE(uint64_t instruction)
 {
-    int64 s_value = extr_sil0il0bs8_il15il8bs1Tmsb8(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    int64_t s_value = extr_sil0il0bs8_il15il8bs1Tmsb8(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string s = IMMEDIATE(copy(s_value));
     std::string rs = GPR(copy(rs_value));
@@ -15846,9 +15846,9 @@ std::string NMD::SYNCIE(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::SYSCALL_16_(uint64 instruction)
+std::string NMD::SYSCALL_16_(uint64_t instruction)
 {
-    uint64 code_value = extract_code_1_0(instruction);
+    uint64_t code_value = extract_code_1_0(instruction);
 
     std::string code = IMMEDIATE(copy(code_value));
 
@@ -15864,9 +15864,9 @@ std::string NMD::SYSCALL_16_(uint64 instruction)
  *  00000000000010
  *           code ------------------
  */
-std::string NMD::SYSCALL_32_(uint64 instruction)
+std::string NMD::SYSCALL_32_(uint64_t instruction)
 {
-    uint64 code_value = extract_code_17_to_0(instruction);
+    uint64_t code_value = extract_code_17_to_0(instruction);
 
     std::string code = IMMEDIATE(copy(code_value));
 
@@ -15884,10 +15884,10 @@ std::string NMD::SYSCALL_32_(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::TEQ(uint64 instruction)
+std::string NMD::TEQ(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rs = GPR(copy(rs_value));
     std::string rt = GPR(copy(rt_value));
@@ -15906,7 +15906,7 @@ std::string NMD::TEQ(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::TLBGINV(uint64 instruction)
+std::string NMD::TLBGINV(uint64_t instruction)
 {
     (void)instruction;
 
@@ -15924,7 +15924,7 @@ std::string NMD::TLBGINV(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::TLBGINVF(uint64 instruction)
+std::string NMD::TLBGINVF(uint64_t instruction)
 {
     (void)instruction;
 
@@ -15942,7 +15942,7 @@ std::string NMD::TLBGINVF(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::TLBGP(uint64 instruction)
+std::string NMD::TLBGP(uint64_t instruction)
 {
     (void)instruction;
 
@@ -15960,7 +15960,7 @@ std::string NMD::TLBGP(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::TLBGR(uint64 instruction)
+std::string NMD::TLBGR(uint64_t instruction)
 {
     (void)instruction;
 
@@ -15978,7 +15978,7 @@ std::string NMD::TLBGR(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::TLBGWI(uint64 instruction)
+std::string NMD::TLBGWI(uint64_t instruction)
 {
     (void)instruction;
 
@@ -15996,7 +15996,7 @@ std::string NMD::TLBGWI(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::TLBGWR(uint64 instruction)
+std::string NMD::TLBGWR(uint64_t instruction)
 {
     (void)instruction;
 
@@ -16014,7 +16014,7 @@ std::string NMD::TLBGWR(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::TLBINV(uint64 instruction)
+std::string NMD::TLBINV(uint64_t instruction)
 {
     (void)instruction;
 
@@ -16032,7 +16032,7 @@ std::string NMD::TLBINV(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::TLBINVF(uint64 instruction)
+std::string NMD::TLBINVF(uint64_t instruction)
 {
     (void)instruction;
 
@@ -16050,7 +16050,7 @@ std::string NMD::TLBINVF(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::TLBP(uint64 instruction)
+std::string NMD::TLBP(uint64_t instruction)
 {
     (void)instruction;
 
@@ -16068,7 +16068,7 @@ std::string NMD::TLBP(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::TLBR(uint64 instruction)
+std::string NMD::TLBR(uint64_t instruction)
 {
     (void)instruction;
 
@@ -16086,7 +16086,7 @@ std::string NMD::TLBR(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::TLBWI(uint64 instruction)
+std::string NMD::TLBWI(uint64_t instruction)
 {
     (void)instruction;
 
@@ -16104,7 +16104,7 @@ std::string NMD::TLBWI(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::TLBWR(uint64 instruction)
+std::string NMD::TLBWR(uint64_t instruction)
 {
     (void)instruction;
 
@@ -16122,10 +16122,10 @@ std::string NMD::TLBWR(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::TNE(uint64 instruction)
+std::string NMD::TNE(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rs = GPR(copy(rs_value));
     std::string rt = GPR(copy(rt_value));
@@ -16144,10 +16144,10 @@ std::string NMD::TNE(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::TRUNC_L_D(uint64 instruction)
+std::string NMD::TRUNC_L_D(uint64_t instruction)
 {
-    uint64 fs_value = extract_fs_15_14_13_12_11(instruction);
-    uint64 ft_value = extract_ft_20_19_18_17_16(instruction);
+    uint64_t fs_value = extract_fs_15_14_13_12_11(instruction);
+    uint64_t ft_value = extract_ft_20_19_18_17_16(instruction);
 
     std::string ft = FPR(copy(ft_value));
     std::string fs = FPR(copy(fs_value));
@@ -16166,10 +16166,10 @@ std::string NMD::TRUNC_L_D(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::TRUNC_L_S(uint64 instruction)
+std::string NMD::TRUNC_L_S(uint64_t instruction)
 {
-    uint64 fs_value = extract_fs_15_14_13_12_11(instruction);
-    uint64 ft_value = extract_ft_20_19_18_17_16(instruction);
+    uint64_t fs_value = extract_fs_15_14_13_12_11(instruction);
+    uint64_t ft_value = extract_ft_20_19_18_17_16(instruction);
 
     std::string ft = FPR(copy(ft_value));
     std::string fs = FPR(copy(fs_value));
@@ -16188,10 +16188,10 @@ std::string NMD::TRUNC_L_S(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::TRUNC_W_D(uint64 instruction)
+std::string NMD::TRUNC_W_D(uint64_t instruction)
 {
-    uint64 fs_value = extract_fs_15_14_13_12_11(instruction);
-    uint64 ft_value = extract_ft_20_19_18_17_16(instruction);
+    uint64_t fs_value = extract_fs_15_14_13_12_11(instruction);
+    uint64_t ft_value = extract_ft_20_19_18_17_16(instruction);
 
     std::string ft = FPR(copy(ft_value));
     std::string fs = FPR(copy(fs_value));
@@ -16210,10 +16210,10 @@ std::string NMD::TRUNC_W_D(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::TRUNC_W_S(uint64 instruction)
+std::string NMD::TRUNC_W_S(uint64_t instruction)
 {
-    uint64 fs_value = extract_fs_15_14_13_12_11(instruction);
-    uint64 ft_value = extract_ft_20_19_18_17_16(instruction);
+    uint64_t fs_value = extract_fs_15_14_13_12_11(instruction);
+    uint64_t ft_value = extract_ft_20_19_18_17_16(instruction);
 
     std::string ft = FPR(copy(ft_value));
     std::string fs = FPR(copy(fs_value));
@@ -16232,12 +16232,12 @@ std::string NMD::TRUNC_W_S(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::UALDM(uint64 instruction)
+std::string NMD::UALDM(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 count3_value = extract_count3_14_13_12(instruction);
-    int64 s_value = extr_sil0il0bs8_il15il8bs1Tmsb8(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t count3_value = extract_count3_14_13_12(instruction);
+    int64_t s_value = extr_sil0il0bs8_il15il8bs1Tmsb8(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rt = GPR(copy(rt_value));
     std::string s = IMMEDIATE(copy(s_value));
@@ -16258,11 +16258,11 @@ std::string NMD::UALDM(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::UALH(uint64 instruction)
+std::string NMD::UALH(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    int64 s_value = extr_sil0il0bs8_il15il8bs1Tmsb8(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    int64_t s_value = extr_sil0il0bs8_il15il8bs1Tmsb8(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rt = GPR(copy(rt_value));
     std::string s = IMMEDIATE(copy(s_value));
@@ -16282,12 +16282,12 @@ std::string NMD::UALH(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::UALWM(uint64 instruction)
+std::string NMD::UALWM(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 count3_value = extract_count3_14_13_12(instruction);
-    int64 s_value = extr_sil0il0bs8_il15il8bs1Tmsb8(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t count3_value = extract_count3_14_13_12(instruction);
+    int64_t s_value = extr_sil0il0bs8_il15il8bs1Tmsb8(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rt = GPR(copy(rt_value));
     std::string s = IMMEDIATE(copy(s_value));
@@ -16308,12 +16308,12 @@ std::string NMD::UALWM(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::UASDM(uint64 instruction)
+std::string NMD::UASDM(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 count3_value = extract_count3_14_13_12(instruction);
-    int64 s_value = extr_sil0il0bs8_il15il8bs1Tmsb8(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t count3_value = extract_count3_14_13_12(instruction);
+    int64_t s_value = extr_sil0il0bs8_il15il8bs1Tmsb8(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rt = GPR(copy(rt_value));
     std::string s = IMMEDIATE(copy(s_value));
@@ -16334,11 +16334,11 @@ std::string NMD::UASDM(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::UASH(uint64 instruction)
+std::string NMD::UASH(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    int64 s_value = extr_sil0il0bs8_il15il8bs1Tmsb8(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    int64_t s_value = extr_sil0il0bs8_il15il8bs1Tmsb8(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rt = GPR(copy(rt_value));
     std::string s = IMMEDIATE(copy(s_value));
@@ -16358,12 +16358,12 @@ std::string NMD::UASH(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::UASWM(uint64 instruction)
+std::string NMD::UASWM(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 count3_value = extract_count3_14_13_12(instruction);
-    int64 s_value = extr_sil0il0bs8_il15il8bs1Tmsb8(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t count3_value = extract_count3_14_13_12(instruction);
+    int64_t s_value = extr_sil0il0bs8_il15il8bs1Tmsb8(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rt = GPR(copy(rt_value));
     std::string s = IMMEDIATE(copy(s_value));
@@ -16384,9 +16384,9 @@ std::string NMD::UASWM(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::UDI(uint64 instruction)
+std::string NMD::UDI(uint64_t instruction)
 {
-    uint64 op_value = extract_op_25_to_3(instruction);
+    uint64_t op_value = extract_op_25_to_3(instruction);
 
     std::string op = IMMEDIATE(copy(op_value));
 
@@ -16402,9 +16402,9 @@ std::string NMD::UDI(uint64 instruction)
  *  001000          1100001101111111
  *   code ----------
  */
-std::string NMD::WAIT(uint64 instruction)
+std::string NMD::WAIT(uint64_t instruction)
 {
-    uint64 code_value = 
extract_code_25_24_23_22_21_20_19_18_17_16(instruction);
+    uint64_t code_value = 
extract_code_25_24_23_22_21_20_19_18_17_16(instruction);
 
     std::string code = IMMEDIATE(copy(code_value));
 
@@ -16421,10 +16421,10 @@ std::string NMD::WAIT(uint64 instruction)
  *     rt -----
  *        mask -------
  */
-std::string NMD::WRDSP(uint64 instruction)
+std::string NMD::WRDSP(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 mask_value = extract_mask_20_19_18_17_16_15_14(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t mask_value = extract_mask_20_19_18_17_16_15_14(instruction);
 
     std::string rt = GPR(copy(rt_value));
     std::string mask = IMMEDIATE(copy(mask_value));
@@ -16443,10 +16443,10 @@ std::string NMD::WRDSP(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::WRPGPR(uint64 instruction)
+std::string NMD::WRPGPR(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rt = GPR(copy(rt_value));
     std::string rs = GPR(copy(rs_value));
@@ -16465,10 +16465,10 @@ std::string NMD::WRPGPR(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::XOR_16_(uint64 instruction)
+std::string NMD::XOR_16_(uint64_t instruction)
 {
-    uint64 rt3_value = extract_rt3_9_8_7(instruction);
-    uint64 rs3_value = extract_rs3_6_5_4(instruction);
+    uint64_t rt3_value = extract_rt3_9_8_7(instruction);
+    uint64_t rs3_value = extract_rs3_6_5_4(instruction);
 
     std::string rs3 = GPR(encode_gpr3(rs3_value));
     std::string rt3 = GPR(encode_gpr3(rt3_value));
@@ -16487,11 +16487,11 @@ std::string NMD::XOR_16_(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::XOR_32_(uint64 instruction)
+std::string NMD::XOR_32_(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 rd_value = extract_rd_20_19_18_17_16(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t rd_value = extract_rd_20_19_18_17_16(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rd = GPR(copy(rd_value));
     std::string rs = GPR(copy(rs_value));
@@ -16511,11 +16511,11 @@ std::string NMD::XOR_32_(uint64 instruction)
  *          rs -----
  *               rd -----
  */
-std::string NMD::XORI(uint64 instruction)
+std::string NMD::XORI(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 u_value = extract_u_11_10_9_8_7_6_5_4_3_2_1_0(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t u_value = extract_u_11_10_9_8_7_6_5_4_3_2_1_0(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rt = GPR(copy(rt_value));
     std::string rs = GPR(copy(rs_value));
@@ -16534,10 +16534,10 @@ std::string NMD::XORI(uint64 instruction)
  *     rt -----
  *          rs -----
  */
-std::string NMD::YIELD(uint64 instruction)
+std::string NMD::YIELD(uint64_t instruction)
 {
-    uint64 rt_value = extract_rt_25_24_23_22_21(instruction);
-    uint64 rs_value = extract_rs_20_19_18_17_16(instruction);
+    uint64_t rt_value = extract_rt_25_24_23_22_21(instruction);
+    uint64_t rs_value = extract_rs_20_19_18_17_16(instruction);
 
     std::string rt = GPR(copy(rt_value));
     std::string rs = GPR(copy(rs_value));
diff --git a/disas/nanomips.h b/disas/nanomips.h
index 84cc9a6dfc..27c7ed65a9 100644
--- a/disas/nanomips.h
+++ b/disas/nanomips.h
@@ -24,11 +24,6 @@
 
 #include <string>
 
-typedef unsigned short uint16;
-typedef unsigned int uint32;
-typedef long long int64;
-typedef unsigned long long uint64;
-
 namespace img
 {
     typedef unsigned long long address;
@@ -75,7 +70,7 @@ public:
     {
     }
 
-    int Disassemble(const uint16 *data, std::string & dis,
+    int Disassemble(const uint16_t *data, std::string & dis,
                     TABLE_ENTRY_TYPE & type);
 
 private:
@@ -83,840 +78,840 @@ private:
     img::address           m_pc;
     TABLE_ATTRIBUTE_TYPE   m_requested_instruction_categories;
 
-    typedef std::string(NMD:: *disassembly_function)(uint64 instruction);
-    typedef bool(NMD:: *conditional_function)(uint64 instruction);
+    typedef std::string(NMD:: *disassembly_function)(uint64_t instruction);
+    typedef bool(NMD:: *conditional_function)(uint64_t instruction);
 
     struct Pool {
         TABLE_ENTRY_TYPE     type;
         struct Pool          *next_table;
         int                  next_table_size;
         int                  instructions_size;
-        uint64               mask;
-        uint64               value;
+        uint64_t               mask;
+        uint64_t               value;
         disassembly_function disassembly;
         conditional_function condition;
-        uint64               attributes;
+        uint64_t               attributes;
     };
 
-    uint64 extract_op_code_value(const uint16 *data, int size);
-    int Disassemble(const uint16 *data, std::string & dis,
+    uint64_t extract_op_code_value(const uint16_t *data, int size);
+    int Disassemble(const uint16_t *data, std::string & dis,
                     TABLE_ENTRY_TYPE & type, const Pool *table, int 
table_size);
 
-    uint64 renumber_registers(uint64 index, uint64 *register_list,
+    uint64_t renumber_registers(uint64_t index, uint64_t *register_list,
                               size_t register_list_size);
-    uint64 encode_gpr3(uint64 d);
-    uint64 encode_gpr3_store(uint64 d);
-    uint64 encode_rd1_from_rd(uint64 d);
-    uint64 encode_gpr4_zero(uint64 d);
-    uint64 encode_gpr4(uint64 d);
-    uint64 encode_rd2_reg1(uint64 d);
-    uint64 encode_rd2_reg2(uint64 d);
+    uint64_t encode_gpr3(uint64_t d);
+    uint64_t encode_gpr3_store(uint64_t d);
+    uint64_t encode_rd1_from_rd(uint64_t d);
+    uint64_t encode_gpr4_zero(uint64_t d);
+    uint64_t encode_gpr4(uint64_t d);
+    uint64_t encode_rd2_reg1(uint64_t d);
+    uint64_t encode_rd2_reg2(uint64_t d);
 
-    uint64 copy(uint64 d);
-    int64 copy(int64 d);
-    int64 neg_copy(uint64 d);
-    int64 neg_copy(int64 d);
-    uint64 encode_rs3_and_check_rs3_ge_rt3(uint64 d);
-    uint64 encode_rs3_and_check_rs3_lt_rt3(uint64 d);
-    uint64 encode_s_from_address(uint64 d);
-    uint64 encode_u_from_address(uint64 d);
-    uint64 encode_s_from_s_hi(uint64 d);
-    uint64 encode_count3_from_count(uint64 d);
-    uint64 encode_shift3_from_shift(uint64 d);
-    int64 encode_eu_from_s_li16(uint64 d);
-    uint64 encode_msbd_from_size(uint64 d);
-    uint64 encode_eu_from_u_andi16(uint64 d);
+    uint64_t copy(uint64_t d);
+    int64_t copy(int64_t d);
+    int64_t neg_copy(uint64_t d);
+    int64_t neg_copy(int64_t d);
+    uint64_t encode_rs3_and_check_rs3_ge_rt3(uint64_t d);
+    uint64_t encode_rs3_and_check_rs3_lt_rt3(uint64_t d);
+    uint64_t encode_s_from_address(uint64_t d);
+    uint64_t encode_u_from_address(uint64_t d);
+    uint64_t encode_s_from_s_hi(uint64_t d);
+    uint64_t encode_count3_from_count(uint64_t d);
+    uint64_t encode_shift3_from_shift(uint64_t d);
+    int64_t encode_eu_from_s_li16(uint64_t d);
+    uint64_t encode_msbd_from_size(uint64_t d);
+    uint64_t encode_eu_from_u_andi16(uint64_t d);
 
-    uint64 encode_msbd_from_pos_and_size(uint64 d);
+    uint64_t encode_msbd_from_pos_and_size(uint64_t d);
 
-    uint64 encode_rt1_from_rt(uint64 d);
-    uint64 encode_lsb_from_pos_and_size(uint64 d);
+    uint64_t encode_rt1_from_rt(uint64_t d);
+    uint64_t encode_lsb_from_pos_and_size(uint64_t d);
 
-    std::string save_restore_list(uint64 rt, uint64 count, uint64 gp);
+    std::string save_restore_list(uint64_t rt, uint64_t count, uint64_t gp);
 
-    std::string GPR(uint64 reg);
-    std::string FPR(uint64 reg);
-    std::string AC(uint64 reg);
-    std::string IMMEDIATE(uint64 value);
-    std::string IMMEDIATE(int64 value);
-    std::string CPR(uint64 reg);
-    std::string ADDRESS(uint64 value, int instruction_size);
+    std::string GPR(uint64_t reg);
+    std::string FPR(uint64_t reg);
+    std::string AC(uint64_t reg);
+    std::string IMMEDIATE(uint64_t value);
+    std::string IMMEDIATE(int64_t value);
+    std::string CPR(uint64_t reg);
+    std::string ADDRESS(uint64_t value, int instruction_size);
 
-    int64 extract_s_4_2_1_0(uint64 instruction);
-    int64 extr_sil0il0bs8_il15il8bs1Tmsb8(uint64 instruction);
-    int64 extr_sil0il10bs1_il1il1bs9Tmsb10(uint64 instruction);
-    int64 extr_sil0il11bs1_il1il1bs10Tmsb11(uint64 instruction);
-    int64 extr_sil0il14bs1_il1il1bs13Tmsb14(uint64 instruction);
-    int64 extr_sil0il16bs16_il16il0bs16Tmsb31(uint64 instruction);
-    int64 extr_sil0il21bs1_il1il1bs20Tmsb21(uint64 instruction);
-    int64 extr_sil0il25bs1_il1il1bs24Tmsb25(uint64 instruction);
-    int64 extr_sil0il31bs1_il2il21bs10_il12il12bs9Tmsb31(uint64 instruction);
-    int64 extr_sil0il7bs1_il1il1bs6Tmsb7(uint64 instruction);
-    int64 extr_sil11il0bs10Tmsb9(uint64 instruction);
-    int64 extract_shift_21_20_19_18_17_16(uint64 instruction);
-    int64 extr_sil2il2bs6_il15il8bs1Tmsb8(uint64 instruction);
-    int64 extr_sil3il3bs5_il15il8bs1Tmsb8(uint64 instruction);
+    int64_t extract_s_4_2_1_0(uint64_t instruction);
+    int64_t extr_sil0il0bs8_il15il8bs1Tmsb8(uint64_t instruction);
+    int64_t extr_sil0il10bs1_il1il1bs9Tmsb10(uint64_t instruction);
+    int64_t extr_sil0il11bs1_il1il1bs10Tmsb11(uint64_t instruction);
+    int64_t extr_sil0il14bs1_il1il1bs13Tmsb14(uint64_t instruction);
+    int64_t extr_sil0il16bs16_il16il0bs16Tmsb31(uint64_t instruction);
+    int64_t extr_sil0il21bs1_il1il1bs20Tmsb21(uint64_t instruction);
+    int64_t extr_sil0il25bs1_il1il1bs24Tmsb25(uint64_t instruction);
+    int64_t extr_sil0il31bs1_il2il21bs10_il12il12bs9Tmsb31(uint64_t 
instruction);
+    int64_t extr_sil0il7bs1_il1il1bs6Tmsb7(uint64_t instruction);
+    int64_t extr_sil11il0bs10Tmsb9(uint64_t instruction);
+    int64_t extract_shift_21_20_19_18_17_16(uint64_t instruction);
+    int64_t extr_sil2il2bs6_il15il8bs1Tmsb8(uint64_t instruction);
+    int64_t extr_sil3il3bs5_il15il8bs1Tmsb8(uint64_t instruction);
 
-    uint64 extract_ac_13_12(uint64 instruction);
-    uint64 extract_bit_16_15_14_13_12_11(uint64 instruction);
-    uint64 extract_bit_23_22_21(uint64 instruction);
-    uint64 extract_c0s_20_19_18_17_16(uint64 instruction);
-    uint64 extract_code_17_to_0(uint64 instruction);
-    uint64 extract_code_18_to_0(uint64 instruction);
-    uint64 extract_code_1_0(uint64 instruction);
-    uint64 extract_code_2_1_0(uint64 instruction);
-    uint64 extract_code_25_24_23_22_21_20_19_18_17_16(uint64 instruction);
-    uint64 extract_cofun_25_24_23(uint64 instruction);
-    uint64 extract_count3_14_13_12(uint64 instruction);
-    uint64 extract_count_3_2_1_0(uint64 instruction);
-    uint64 extract_count_19_18_17_16(uint64 instruction);
-    uint64 extract_cs_20_19_18_17_16(uint64 instruction);
-    uint64 extract_cs_25_24_23_22_21(uint64 instruction);
-    uint64 extract_ct_25_24_23_22_21(uint64 instruction);
-    uint64 extract_eu_3_2_1_0(uint64 instruction);
-    uint64 extract_eu_6_5_4_3_2_1_0(uint64 instruction);
-    uint64 extract_fd_10_9_8_7_6(uint64 instruction);
-    uint64 extract_fs_15_14_13_12_11(uint64 instruction);
-    uint64 extract_ft_15_14_13_12_11(uint64 instruction);
-    uint64 extract_ft_20_19_18_17_16(uint64 instruction);
-    uint64 extract_gp_2(uint64 instruction);
-    uint64 extract_hint_25_24_23_22_21(uint64 instruction);
-    uint64 extract_hs_20_19_18_17_16(uint64 instruction);
-    uint64 extract_lsb_4_3_2_1_0(uint64 instruction);
-    uint64 extract_mask_20_19_18_17_16_15_14(uint64 instruction);
-    uint64 extract_msbt_10_9_8_7_6(uint64 instruction);
-    uint64 extract_op_25_24_23_22_21(uint64 instruction);
-    uint64 extract_op_25_to_3(uint64 instruction);
-    uint64 extract_rdl_25_24(uint64 instruction);
-    uint64 extract_rd2_3_8(uint64 instruction);
-    uint64 extract_rd3_3_2_1(uint64 instruction);
-    uint64 extract_rd_20_19_18_17_16(uint64 instruction);
-    uint64 extract_rs3_6_5_4(uint64 instruction);
-    uint64 extract_rs4_4_2_1_0(uint64 instruction);
-    uint64 extract_rs_4_3_2_1_0(uint64 instruction);
-    uint64 extract_rs_20_19_18_17_16(uint64 instruction);
-    uint64 extract_rsz4_4_2_1_0(uint64 instruction);
-    uint64 extract_rtl_11(uint64 instruction);
-    uint64 extract_rt3_9_8_7(uint64 instruction);
-    uint64 extract_rt4_9_7_6_5(uint64 instruction);
-    uint64 extract_rt_25_24_23_22_21(uint64 instruction);
-    uint64 extract_rt_41_40_39_38_37(uint64 instruction);
-    uint64 extract_rt_9_8_7_6_5(uint64 instruction);
-    uint64 extract_rtz3_9_8_7(uint64 instruction);
-    uint64 extract_rtz4_27_26_25_23_22_21(uint64 instruction);
-    uint64 extract_rtz4_9_7_6_5(uint64 instruction);
-    uint64 extract_ru_7_6_5_4_3(uint64 instruction);
-    uint64 extract_sa_15_14_13_12_11(uint64 instruction);
-    uint64 extract_sa_15_14_13_12(uint64 instruction);
-    uint64 extract_sa_15_14_13(uint64 instruction);
-    uint64 extract_sel_13_12_11(uint64 instruction);
-    uint64 extract_sel_15_14_13_12_11(uint64 instruction);
-    uint64 extract_shift3_2_1_0(uint64 instruction);
-    uint64 extract_shift_4_3_2_1_0(uint64 instruction);
-    uint64 extract_shift_5_4_3_2_1_0(uint64 instruction);
-    uint64 extract_shift_20_19_18_17_16(uint64 instruction);
-    uint64 extract_shift_10_9_8_7_6(uint64 instruction);
-    uint64 extract_shiftx_11_10_9_8_7_6(uint64 instruction);
-    uint64 extr_shiftxil7il1bs4Fmsb4(uint64 instruction);
-    uint64 extract_size_20_19_18_17_16(uint64 instruction);
-    uint64 extract_stripe_6(uint64 instruction);
-    uint64 extract_stype_20_19_18_17_16(uint64 instruction);
-    uint64 extract_u2_10_9(uint64 instruction);
-    uint64 extract_u_11_10_9_8_7_6_5_4_3_2_1_0(uint64 instruction);
-    uint64 extract_u_15_to_0(uint64 instruction);
-    uint64 extract_u_17_to_0(uint64 instruction);
-    uint64 extract_u_1_0(uint64 instruction);
-    uint64 extr_uil0il1bs4Fmsb4(uint64 instruction);
-    uint64 extr_uil0il2bs3Fmsb4(uint64 instruction);
-    uint64 extr_uil0il2bs4Fmsb5(uint64 instruction);
-    uint64 extr_uil0il2bs5Fmsb6(uint64 instruction);
-    uint64 extr_uil0il2bs6Fmsb7(uint64 instruction);
-    uint64 extr_uil0il2bs7Fmsb8(uint64 instruction);
-    uint64 extr_uil0il32bs32Fmsb63(uint64 instruction);
-    uint64 extract_u_10(uint64 instruction);
-    uint64 extract_u_17_16_15_14_13_12_11(uint64 instruction);
-    uint64 extract_u_20_19_18_17_16_15_14_13(uint64 instruction);
-    uint64 extr_uil1il1bs17Fmsb17(uint64 instruction);
-    uint64 extr_uil1il1bs2Fmsb2(uint64 instruction);
-    uint64 extr_uil2il2bs16Fmsb17(uint64 instruction);
-    uint64 extr_uil2il2bs19Fmsb20(uint64 instruction);
-    uint64 extr_uil3il3bs18Fmsb20(uint64 instruction);
-    uint64 extr_uil3il3bs1_il8il2bs1Fmsb3(uint64 instruction);
-    uint64 extr_uil3il3bs9Fmsb11(uint64 instruction);
-    uint64 extr_uil4il4bs4Fmsb7(uint64 instruction);
-    uint64 extr_xil0il0bs12Fmsb11(uint64 instruction);
-    uint64 extr_xil0il0bs3_il4il0bs1Fmsb2(uint64 instruction);
-    uint64 extr_xil10il0bs1Fmsb0(uint64 instruction);
-    uint64 extr_xil10il0bs1_il11il0bs5Fmsb4(uint64 instruction);
-    uint64 extr_xil10il0bs1_il14il0bs2Fmsb1(uint64 instruction);
-    uint64 extr_xil10il0bs4_il22il0bs4Fmsb3(uint64 instruction);
-    uint64 extr_xil10il0bs6Fmsb5(uint64 instruction);
-    uint64 extr_xil11il0bs1Fmsb0(uint64 instruction);
-    uint64 extr_xil11il0bs5Fmsb4(uint64 instruction);
-    uint64 extr_xil12il0bs1Fmsb0(uint64 instruction);
-    uint64 extr_xil14il0bs1_il15il0bs1Fmsb0(uint64 instruction);
-    uint64 extr_xil14il0bs2Fmsb1(uint64 instruction);
-    uint64 extr_xil15il0bs1Fmsb0(uint64 instruction);
-    uint64 extr_xil16il0bs10Fmsb9(uint64 instruction);
-    uint64 extr_xil16il0bs5Fmsb4(uint64 instruction);
-    uint64 extr_xil17il0bs1Fmsb0(uint64 instruction);
-    uint64 extr_xil17il0bs9Fmsb8(uint64 instruction);
-    uint64 extr_xil21il0bs5Fmsb4(uint64 instruction);
-    uint64 extr_xil24il0bs1Fmsb0(uint64 instruction);
-    uint64 extr_xil2il0bs1_il15il0bs1Fmsb0(uint64 instruction);
-    uint64 extr_xil6il0bs3Fmsb2(uint64 instruction);
-    uint64 extr_xil6il0bs3_il10il0bs1Fmsb2(uint64 instruction);
-    uint64 extr_xil9il0bs2Fmsb1(uint64 instruction);
-    uint64 extr_xil9il0bs3Fmsb2(uint64 instruction);
-    uint64 extr_xil9il0bs3_il16il0bs5Fmsb4(uint64 instruction);
+    uint64_t extract_ac_13_12(uint64_t instruction);
+    uint64_t extract_bit_16_15_14_13_12_11(uint64_t instruction);
+    uint64_t extract_bit_23_22_21(uint64_t instruction);
+    uint64_t extract_c0s_20_19_18_17_16(uint64_t instruction);
+    uint64_t extract_code_17_to_0(uint64_t instruction);
+    uint64_t extract_code_18_to_0(uint64_t instruction);
+    uint64_t extract_code_1_0(uint64_t instruction);
+    uint64_t extract_code_2_1_0(uint64_t instruction);
+    uint64_t extract_code_25_24_23_22_21_20_19_18_17_16(uint64_t instruction);
+    uint64_t extract_cofun_25_24_23(uint64_t instruction);
+    uint64_t extract_count3_14_13_12(uint64_t instruction);
+    uint64_t extract_count_3_2_1_0(uint64_t instruction);
+    uint64_t extract_count_19_18_17_16(uint64_t instruction);
+    uint64_t extract_cs_20_19_18_17_16(uint64_t instruction);
+    uint64_t extract_cs_25_24_23_22_21(uint64_t instruction);
+    uint64_t extract_ct_25_24_23_22_21(uint64_t instruction);
+    uint64_t extract_eu_3_2_1_0(uint64_t instruction);
+    uint64_t extract_eu_6_5_4_3_2_1_0(uint64_t instruction);
+    uint64_t extract_fd_10_9_8_7_6(uint64_t instruction);
+    uint64_t extract_fs_15_14_13_12_11(uint64_t instruction);
+    uint64_t extract_ft_15_14_13_12_11(uint64_t instruction);
+    uint64_t extract_ft_20_19_18_17_16(uint64_t instruction);
+    uint64_t extract_gp_2(uint64_t instruction);
+    uint64_t extract_hint_25_24_23_22_21(uint64_t instruction);
+    uint64_t extract_hs_20_19_18_17_16(uint64_t instruction);
+    uint64_t extract_lsb_4_3_2_1_0(uint64_t instruction);
+    uint64_t extract_mask_20_19_18_17_16_15_14(uint64_t instruction);
+    uint64_t extract_msbt_10_9_8_7_6(uint64_t instruction);
+    uint64_t extract_op_25_24_23_22_21(uint64_t instruction);
+    uint64_t extract_op_25_to_3(uint64_t instruction);
+    uint64_t extract_rdl_25_24(uint64_t instruction);
+    uint64_t extract_rd2_3_8(uint64_t instruction);
+    uint64_t extract_rd3_3_2_1(uint64_t instruction);
+    uint64_t extract_rd_20_19_18_17_16(uint64_t instruction);
+    uint64_t extract_rs3_6_5_4(uint64_t instruction);
+    uint64_t extract_rs4_4_2_1_0(uint64_t instruction);
+    uint64_t extract_rs_4_3_2_1_0(uint64_t instruction);
+    uint64_t extract_rs_20_19_18_17_16(uint64_t instruction);
+    uint64_t extract_rsz4_4_2_1_0(uint64_t instruction);
+    uint64_t extract_rtl_11(uint64_t instruction);
+    uint64_t extract_rt3_9_8_7(uint64_t instruction);
+    uint64_t extract_rt4_9_7_6_5(uint64_t instruction);
+    uint64_t extract_rt_25_24_23_22_21(uint64_t instruction);
+    uint64_t extract_rt_41_40_39_38_37(uint64_t instruction);
+    uint64_t extract_rt_9_8_7_6_5(uint64_t instruction);
+    uint64_t extract_rtz3_9_8_7(uint64_t instruction);
+    uint64_t extract_rtz4_27_26_25_23_22_21(uint64_t instruction);
+    uint64_t extract_rtz4_9_7_6_5(uint64_t instruction);
+    uint64_t extract_ru_7_6_5_4_3(uint64_t instruction);
+    uint64_t extract_sa_15_14_13_12_11(uint64_t instruction);
+    uint64_t extract_sa_15_14_13_12(uint64_t instruction);
+    uint64_t extract_sa_15_14_13(uint64_t instruction);
+    uint64_t extract_sel_13_12_11(uint64_t instruction);
+    uint64_t extract_sel_15_14_13_12_11(uint64_t instruction);
+    uint64_t extract_shift3_2_1_0(uint64_t instruction);
+    uint64_t extract_shift_4_3_2_1_0(uint64_t instruction);
+    uint64_t extract_shift_5_4_3_2_1_0(uint64_t instruction);
+    uint64_t extract_shift_20_19_18_17_16(uint64_t instruction);
+    uint64_t extract_shift_10_9_8_7_6(uint64_t instruction);
+    uint64_t extract_shiftx_11_10_9_8_7_6(uint64_t instruction);
+    uint64_t extr_shiftxil7il1bs4Fmsb4(uint64_t instruction);
+    uint64_t extract_size_20_19_18_17_16(uint64_t instruction);
+    uint64_t extract_stripe_6(uint64_t instruction);
+    uint64_t extract_stype_20_19_18_17_16(uint64_t instruction);
+    uint64_t extract_u2_10_9(uint64_t instruction);
+    uint64_t extract_u_11_10_9_8_7_6_5_4_3_2_1_0(uint64_t instruction);
+    uint64_t extract_u_15_to_0(uint64_t instruction);
+    uint64_t extract_u_17_to_0(uint64_t instruction);
+    uint64_t extract_u_1_0(uint64_t instruction);
+    uint64_t extr_uil0il1bs4Fmsb4(uint64_t instruction);
+    uint64_t extr_uil0il2bs3Fmsb4(uint64_t instruction);
+    uint64_t extr_uil0il2bs4Fmsb5(uint64_t instruction);
+    uint64_t extr_uil0il2bs5Fmsb6(uint64_t instruction);
+    uint64_t extr_uil0il2bs6Fmsb7(uint64_t instruction);
+    uint64_t extr_uil0il2bs7Fmsb8(uint64_t instruction);
+    uint64_t extr_uil0il32bs32Fmsb63(uint64_t instruction);
+    uint64_t extract_u_10(uint64_t instruction);
+    uint64_t extract_u_17_16_15_14_13_12_11(uint64_t instruction);
+    uint64_t extract_u_20_19_18_17_16_15_14_13(uint64_t instruction);
+    uint64_t extr_uil1il1bs17Fmsb17(uint64_t instruction);
+    uint64_t extr_uil1il1bs2Fmsb2(uint64_t instruction);
+    uint64_t extr_uil2il2bs16Fmsb17(uint64_t instruction);
+    uint64_t extr_uil2il2bs19Fmsb20(uint64_t instruction);
+    uint64_t extr_uil3il3bs18Fmsb20(uint64_t instruction);
+    uint64_t extr_uil3il3bs1_il8il2bs1Fmsb3(uint64_t instruction);
+    uint64_t extr_uil3il3bs9Fmsb11(uint64_t instruction);
+    uint64_t extr_uil4il4bs4Fmsb7(uint64_t instruction);
+    uint64_t extr_xil0il0bs12Fmsb11(uint64_t instruction);
+    uint64_t extr_xil0il0bs3_il4il0bs1Fmsb2(uint64_t instruction);
+    uint64_t extr_xil10il0bs1Fmsb0(uint64_t instruction);
+    uint64_t extr_xil10il0bs1_il11il0bs5Fmsb4(uint64_t instruction);
+    uint64_t extr_xil10il0bs1_il14il0bs2Fmsb1(uint64_t instruction);
+    uint64_t extr_xil10il0bs4_il22il0bs4Fmsb3(uint64_t instruction);
+    uint64_t extr_xil10il0bs6Fmsb5(uint64_t instruction);
+    uint64_t extr_xil11il0bs1Fmsb0(uint64_t instruction);
+    uint64_t extr_xil11il0bs5Fmsb4(uint64_t instruction);
+    uint64_t extr_xil12il0bs1Fmsb0(uint64_t instruction);
+    uint64_t extr_xil14il0bs1_il15il0bs1Fmsb0(uint64_t instruction);
+    uint64_t extr_xil14il0bs2Fmsb1(uint64_t instruction);
+    uint64_t extr_xil15il0bs1Fmsb0(uint64_t instruction);
+    uint64_t extr_xil16il0bs10Fmsb9(uint64_t instruction);
+    uint64_t extr_xil16il0bs5Fmsb4(uint64_t instruction);
+    uint64_t extr_xil17il0bs1Fmsb0(uint64_t instruction);
+    uint64_t extr_xil17il0bs9Fmsb8(uint64_t instruction);
+    uint64_t extr_xil21il0bs5Fmsb4(uint64_t instruction);
+    uint64_t extr_xil24il0bs1Fmsb0(uint64_t instruction);
+    uint64_t extr_xil2il0bs1_il15il0bs1Fmsb0(uint64_t instruction);
+    uint64_t extr_xil6il0bs3Fmsb2(uint64_t instruction);
+    uint64_t extr_xil6il0bs3_il10il0bs1Fmsb2(uint64_t instruction);
+    uint64_t extr_xil9il0bs2Fmsb1(uint64_t instruction);
+    uint64_t extr_xil9il0bs3Fmsb2(uint64_t instruction);
+    uint64_t extr_xil9il0bs3_il16il0bs5Fmsb4(uint64_t instruction);
 
-    bool ADDIU_32__cond(uint64 instruction);
-    bool ADDIU_RS5__cond(uint64 instruction);
-    bool BALRSC_cond(uint64 instruction);
-    bool BEQC_16__cond(uint64 instruction);
-    bool BNEC_16__cond(uint64 instruction);
-    bool MOVE_cond(uint64 instruction);
-    bool P16_BR1_cond(uint64 instruction);
-    bool PREF_S9__cond(uint64 instruction);
-    bool PREFE_cond(uint64 instruction);
-    bool SLTU_cond(uint64 instruction);
+    bool ADDIU_32__cond(uint64_t instruction);
+    bool ADDIU_RS5__cond(uint64_t instruction);
+    bool BALRSC_cond(uint64_t instruction);
+    bool BEQC_16__cond(uint64_t instruction);
+    bool BNEC_16__cond(uint64_t instruction);
+    bool MOVE_cond(uint64_t instruction);
+    bool P16_BR1_cond(uint64_t instruction);
+    bool PREF_S9__cond(uint64_t instruction);
+    bool PREFE_cond(uint64_t instruction);
+    bool SLTU_cond(uint64_t instruction);
 
-    std::string ABS_D(uint64 instruction);
-    std::string ABS_S(uint64 instruction);
-    std::string ABSQ_S_PH(uint64 instruction);
-    std::string ABSQ_S_QB(uint64 instruction);
-    std::string ABSQ_S_W(uint64 instruction);
-    std::string ACLR(uint64 instruction);
-    std::string ADD(uint64 instruction);
-    std::string ADD_D(uint64 instruction);
-    std::string ADD_S(uint64 instruction);
-    std::string ADDIU_32_(uint64 instruction);
-    std::string ADDIU_48_(uint64 instruction);
-    std::string ADDIU_GP48_(uint64 instruction);
-    std::string ADDIU_GP_B_(uint64 instruction);
-    std::string ADDIU_GP_W_(uint64 instruction);
-    std::string ADDIU_NEG_(uint64 instruction);
-    std::string ADDIU_R1_SP_(uint64 instruction);
-    std::string ADDIU_R2_(uint64 instruction);
-    std::string ADDIU_RS5_(uint64 instruction);
-    std::string ADDIUPC_32_(uint64 instruction);
-    std::string ADDIUPC_48_(uint64 instruction);
-    std::string ADDQ_PH(uint64 instruction);
-    std::string ADDQ_S_PH(uint64 instruction);
-    std::string ADDQ_S_W(uint64 instruction);
-    std::string ADDQH_PH(uint64 instruction);
-    std::string ADDQH_R_PH(uint64 instruction);
-    std::string ADDQH_R_W(uint64 instruction);
-    std::string ADDQH_W(uint64 instruction);
-    std::string ADDSC(uint64 instruction);
-    std::string ADDU_16_(uint64 instruction);
-    std::string ADDU_32_(uint64 instruction);
-    std::string ADDU_4X4_(uint64 instruction);
-    std::string ADDU_PH(uint64 instruction);
-    std::string ADDU_QB(uint64 instruction);
-    std::string ADDU_S_PH(uint64 instruction);
-    std::string ADDU_S_QB(uint64 instruction);
-    std::string ADDUH_QB(uint64 instruction);
-    std::string ADDUH_R_QB(uint64 instruction);
-    std::string ADDWC(uint64 instruction);
-    std::string ALUIPC(uint64 instruction);
-    std::string AND_16_(uint64 instruction);
-    std::string AND_32_(uint64 instruction);
-    std::string ANDI_16_(uint64 instruction);
-    std::string ANDI_32_(uint64 instruction);
-    std::string APPEND(uint64 instruction);
-    std::string ASET(uint64 instruction);
-    std::string BALC_16_(uint64 instruction);
-    std::string BALC_32_(uint64 instruction);
-    std::string BALRSC(uint64 instruction);
-    std::string BBEQZC(uint64 instruction);
-    std::string BBNEZC(uint64 instruction);
-    std::string BC_16_(uint64 instruction);
-    std::string BC_32_(uint64 instruction);
-    std::string BC1EQZC(uint64 instruction);
-    std::string BC1NEZC(uint64 instruction);
-    std::string BC2EQZC(uint64 instruction);
-    std::string BC2NEZC(uint64 instruction);
-    std::string BEQC_16_(uint64 instruction);
-    std::string BEQC_32_(uint64 instruction);
-    std::string BEQIC(uint64 instruction);
-    std::string BEQZC_16_(uint64 instruction);
-    std::string BGEC(uint64 instruction);
-    std::string BGEIC(uint64 instruction);
-    std::string BGEIUC(uint64 instruction);
-    std::string BGEUC(uint64 instruction);
-    std::string BLTC(uint64 instruction);
-    std::string BLTIC(uint64 instruction);
-    std::string BLTIUC(uint64 instruction);
-    std::string BLTUC(uint64 instruction);
-    std::string BNEC_16_(uint64 instruction);
-    std::string BNEC_32_(uint64 instruction);
-    std::string BNEIC(uint64 instruction);
-    std::string BNEZC_16_(uint64 instruction);
-    std::string BPOSGE32C(uint64 instruction);
-    std::string BREAK_16_(uint64 instruction);
-    std::string BREAK_32_(uint64 instruction);
-    std::string BRSC(uint64 instruction);
-    std::string CACHE(uint64 instruction);
-    std::string CACHEE(uint64 instruction);
-    std::string CEIL_L_D(uint64 instruction);
-    std::string CEIL_L_S(uint64 instruction);
-    std::string CEIL_W_D(uint64 instruction);
-    std::string CEIL_W_S(uint64 instruction);
-    std::string CFC1(uint64 instruction);
-    std::string CFC2(uint64 instruction);
-    std::string CLASS_D(uint64 instruction);
-    std::string CLASS_S(uint64 instruction);
-    std::string CLO(uint64 instruction);
-    std::string CLZ(uint64 instruction);
-    std::string CMP_AF_D(uint64 instruction);
-    std::string CMP_AF_S(uint64 instruction);
-    std::string CMP_EQ_D(uint64 instruction);
-    std::string CMP_EQ_PH(uint64 instruction);
-    std::string CMP_EQ_S(uint64 instruction);
-    std::string CMP_LE_D(uint64 instruction);
-    std::string CMP_LE_PH(uint64 instruction);
-    std::string CMP_LE_S(uint64 instruction);
-    std::string CMP_LT_D(uint64 instruction);
-    std::string CMP_LT_PH(uint64 instruction);
-    std::string CMP_LT_S(uint64 instruction);
-    std::string CMP_NE_D(uint64 instruction);
-    std::string CMP_NE_S(uint64 instruction);
-    std::string CMP_OR_D(uint64 instruction);
-    std::string CMP_OR_S(uint64 instruction);
-    std::string CMP_SAF_D(uint64 instruction);
-    std::string CMP_SAF_S(uint64 instruction);
-    std::string CMP_SEQ_D(uint64 instruction);
-    std::string CMP_SEQ_S(uint64 instruction);
-    std::string CMP_SLE_D(uint64 instruction);
-    std::string CMP_SLE_S(uint64 instruction);
-    std::string CMP_SLT_D(uint64 instruction);
-    std::string CMP_SLT_S(uint64 instruction);
-    std::string CMP_SNE_D(uint64 instruction);
-    std::string CMP_SNE_S(uint64 instruction);
-    std::string CMP_SOR_D(uint64 instruction);
-    std::string CMP_SOR_S(uint64 instruction);
-    std::string CMP_SUEQ_D(uint64 instruction);
-    std::string CMP_SUEQ_S(uint64 instruction);
-    std::string CMP_SULE_D(uint64 instruction);
-    std::string CMP_SULE_S(uint64 instruction);
-    std::string CMP_SULT_D(uint64 instruction);
-    std::string CMP_SULT_S(uint64 instruction);
-    std::string CMP_SUN_D(uint64 instruction);
-    std::string CMP_SUN_S(uint64 instruction);
-    std::string CMP_SUNE_D(uint64 instruction);
-    std::string CMP_SUNE_S(uint64 instruction);
-    std::string CMP_UEQ_D(uint64 instruction);
-    std::string CMP_UEQ_S(uint64 instruction);
-    std::string CMP_ULE_D(uint64 instruction);
-    std::string CMP_ULE_S(uint64 instruction);
-    std::string CMP_ULT_D(uint64 instruction);
-    std::string CMP_ULT_S(uint64 instruction);
-    std::string CMP_UN_D(uint64 instruction);
-    std::string CMP_UN_S(uint64 instruction);
-    std::string CMP_UNE_D(uint64 instruction);
-    std::string CMP_UNE_S(uint64 instruction);
-    std::string CMPGDU_EQ_QB(uint64 instruction);
-    std::string CMPGDU_LE_QB(uint64 instruction);
-    std::string CMPGDU_LT_QB(uint64 instruction);
-    std::string CMPGU_EQ_QB(uint64 instruction);
-    std::string CMPGU_LE_QB(uint64 instruction);
-    std::string CMPGU_LT_QB(uint64 instruction);
-    std::string CMPU_EQ_QB(uint64 instruction);
-    std::string CMPU_LE_QB(uint64 instruction);
-    std::string CMPU_LT_QB(uint64 instruction);
-    std::string COP2_1(uint64 instruction);
-    std::string CTC1(uint64 instruction);
-    std::string CTC2(uint64 instruction);
-    std::string CVT_D_L(uint64 instruction);
-    std::string CVT_D_S(uint64 instruction);
-    std::string CVT_D_W(uint64 instruction);
-    std::string CVT_L_D(uint64 instruction);
-    std::string CVT_L_S(uint64 instruction);
-    std::string CVT_S_D(uint64 instruction);
-    std::string CVT_S_L(uint64 instruction);
-    std::string CVT_S_PL(uint64 instruction);
-    std::string CVT_S_PU(uint64 instruction);
-    std::string CVT_S_W(uint64 instruction);
-    std::string CVT_W_D(uint64 instruction);
-    std::string CVT_W_S(uint64 instruction);
-    std::string DADDIU_48_(uint64 instruction);
-    std::string DADDIU_NEG_(uint64 instruction);
-    std::string DADDIU_U12_(uint64 instruction);
-    std::string DADD(uint64 instruction);
-    std::string DADDU(uint64 instruction);
-    std::string DCLO(uint64 instruction);
-    std::string DCLZ(uint64 instruction);
-    std::string DDIV(uint64 instruction);
-    std::string DDIVU(uint64 instruction);
-    std::string DERET(uint64 instruction);
-    std::string DEXTM(uint64 instruction);
-    std::string DEXT(uint64 instruction);
-    std::string DEXTU(uint64 instruction);
-    std::string DINSM(uint64 instruction);
-    std::string DINS(uint64 instruction);
-    std::string DINSU(uint64 instruction);
-    std::string DI(uint64 instruction);
-    std::string DIV(uint64 instruction);
-    std::string DIV_D(uint64 instruction);
-    std::string DIV_S(uint64 instruction);
-    std::string DIVU(uint64 instruction);
-    std::string DLSA(uint64 instruction);
-    std::string DLUI_48_(uint64 instruction);
-    std::string DMFC0(uint64 instruction);
-    std::string DMFC1(uint64 instruction);
-    std::string DMFC2(uint64 instruction);
-    std::string DMFGC0(uint64 instruction);
-    std::string DMOD(uint64 instruction);
-    std::string DMODU(uint64 instruction);
-    std::string DMTC0(uint64 instruction);
-    std::string DMTC1(uint64 instruction);
-    std::string DMTC2(uint64 instruction);
-    std::string DMTGC0(uint64 instruction);
-    std::string DMT(uint64 instruction);
-    std::string DMUH(uint64 instruction);
-    std::string DMUHU(uint64 instruction);
-    std::string DMUL(uint64 instruction);
-    std::string DMULU(uint64 instruction);
-    std::string DPAQ_S_W_PH(uint64 instruction);
-    std::string DPAQ_SA_L_W(uint64 instruction);
-    std::string DPAQX_S_W_PH(uint64 instruction);
-    std::string DPAQX_SA_W_PH(uint64 instruction);
-    std::string DPAU_H_QBL(uint64 instruction);
-    std::string DPAU_H_QBR(uint64 instruction);
-    std::string DPA_W_PH(uint64 instruction);
-    std::string DPAX_W_PH(uint64 instruction);
-    std::string DPS_W_PH(uint64 instruction);
-    std::string DPSQ_SA_L_W(uint64 instruction);
-    std::string DPSQ_S_W_PH(uint64 instruction);
-    std::string DPSQX_SA_W_PH(uint64 instruction);
-    std::string DPSQX_S_W_PH(uint64 instruction);
-    std::string DPSU_H_QBL(uint64 instruction);
-    std::string DPSU_H_QBR(uint64 instruction);
-    std::string DPSX_W_PH(uint64 instruction);
-    std::string DROTR(uint64 instruction);
-    std::string DROTR32(uint64 instruction);
-    std::string DROTRV(uint64 instruction);
-    std::string DROTX(uint64 instruction);
-    std::string DSLL(uint64 instruction);
-    std::string DSLL32(uint64 instruction);
-    std::string DSLLV(uint64 instruction);
-    std::string DSRA(uint64 instruction);
-    std::string DSRA32(uint64 instruction);
-    std::string DSRAV(uint64 instruction);
-    std::string DSRL32(uint64 instruction);
-    std::string DSRL(uint64 instruction);
-    std::string DSRLV(uint64 instruction);
-    std::string DSUB(uint64 instruction);
-    std::string DSUBU(uint64 instruction);
-    std::string DVP(uint64 instruction);
-    std::string DVPE(uint64 instruction);
-    std::string EHB(uint64 instruction);
-    std::string EI(uint64 instruction);
-    std::string EMT(uint64 instruction);
-    std::string ERET(uint64 instruction);
-    std::string ERETNC(uint64 instruction);
-    std::string EVP(uint64 instruction);
-    std::string EVPE(uint64 instruction);
-    std::string EXT(uint64 instruction);
-    std::string EXTD(uint64 instruction);
-    std::string EXTD32(uint64 instruction);
-    std::string EXTP(uint64 instruction);
-    std::string EXTPDP(uint64 instruction);
-    std::string EXTPDPV(uint64 instruction);
-    std::string EXTPV(uint64 instruction);
-    std::string EXTR_RS_W(uint64 instruction);
-    std::string EXTR_R_W(uint64 instruction);
-    std::string EXTR_S_H(uint64 instruction);
-    std::string EXTR_W(uint64 instruction);
-    std::string EXTRV_R_W(uint64 instruction);
-    std::string EXTRV_RS_W(uint64 instruction);
-    std::string EXTRV_S_H(uint64 instruction);
-    std::string EXTRV_W(uint64 instruction);
-    std::string EXTW(uint64 instruction);
-    std::string FLOOR_L_D(uint64 instruction);
-    std::string FLOOR_L_S(uint64 instruction);
-    std::string FLOOR_W_D(uint64 instruction);
-    std::string FLOOR_W_S(uint64 instruction);
-    std::string FORK(uint64 instruction);
-    std::string HYPCALL(uint64 instruction);
-    std::string HYPCALL_16_(uint64 instruction);
-    std::string INS(uint64 instruction);
-    std::string INSV(uint64 instruction);
-    std::string IRET(uint64 instruction);
-    std::string JALRC_16_(uint64 instruction);
-    std::string JALRC_32_(uint64 instruction);
-    std::string JALRC_HB(uint64 instruction);
-    std::string JRC(uint64 instruction);
-    std::string LB_16_(uint64 instruction);
-    std::string LB_GP_(uint64 instruction);
-    std::string LB_S9_(uint64 instruction);
-    std::string LB_U12_(uint64 instruction);
-    std::string LBE(uint64 instruction);
-    std::string LBU_16_(uint64 instruction);
-    std::string LBU_GP_(uint64 instruction);
-    std::string LBU_S9_(uint64 instruction);
-    std::string LBU_U12_(uint64 instruction);
-    std::string LBUE(uint64 instruction);
-    std::string LBUX(uint64 instruction);
-    std::string LBX(uint64 instruction);
-    std::string LD_GP_(uint64 instruction);
-    std::string LD_S9_(uint64 instruction);
-    std::string LD_U12_(uint64 instruction);
-    std::string LDC1_GP_(uint64 instruction);
-    std::string LDC1_S9_(uint64 instruction);
-    std::string LDC1_U12_(uint64 instruction);
-    std::string LDC1X(uint64 instruction);
-    std::string LDC1XS(uint64 instruction);
-    std::string LDC2(uint64 instruction);
-    std::string LDM(uint64 instruction);
-    std::string LDPC_48_(uint64 instruction);
-    std::string LDX(uint64 instruction);
-    std::string LDXS(uint64 instruction);
-    std::string LH_16_(uint64 instruction);
-    std::string LH_GP_(uint64 instruction);
-    std::string LH_S9_(uint64 instruction);
-    std::string LH_U12_(uint64 instruction);
-    std::string LHE(uint64 instruction);
-    std::string LHU_16_(uint64 instruction);
-    std::string LHU_GP_(uint64 instruction);
-    std::string LHU_S9_(uint64 instruction);
-    std::string LHU_U12_(uint64 instruction);
-    std::string LHUE(uint64 instruction);
-    std::string LHUX(uint64 instruction);
-    std::string LHUXS(uint64 instruction);
-    std::string LHX(uint64 instruction);
-    std::string LHXS(uint64 instruction);
-    std::string LI_16_(uint64 instruction);
-    std::string LI_48_(uint64 instruction);
-    std::string LL(uint64 instruction);
-    std::string LLD(uint64 instruction);
-    std::string LLDP(uint64 instruction);
-    std::string LLE(uint64 instruction);
-    std::string LLWP(uint64 instruction);
-    std::string LLWPE(uint64 instruction);
-    std::string LSA(uint64 instruction);
-    std::string LUI(uint64 instruction);
-    std::string LW_16_(uint64 instruction);
-    std::string LW_4X4_(uint64 instruction);
-    std::string LWC1_GP_(uint64 instruction);
-    std::string LWC1_S9_(uint64 instruction);
-    std::string LWC1_U12_(uint64 instruction);
-    std::string LWC1X(uint64 instruction);
-    std::string LWC1XS(uint64 instruction);
-    std::string LWC2(uint64 instruction);
-    std::string LWE(uint64 instruction);
-    std::string LW_GP_(uint64 instruction);
-    std::string LW_GP16_(uint64 instruction);
-    std::string LWM(uint64 instruction);
-    std::string LWPC_48_(uint64 instruction);
-    std::string LW_S9_(uint64 instruction);
-    std::string LW_SP_(uint64 instruction);
-    std::string LW_U12_(uint64 instruction);
-    std::string LWU_GP_(uint64 instruction);
-    std::string LWU_S9_(uint64 instruction);
-    std::string LWU_U12_(uint64 instruction);
-    std::string LWUX(uint64 instruction);
-    std::string LWUXS(uint64 instruction);
-    std::string LWX(uint64 instruction);
-    std::string LWXS_16_(uint64 instruction);
-    std::string LWXS_32_(uint64 instruction);
-    std::string MADD_DSP_(uint64 instruction);
-    std::string MADDF_D(uint64 instruction);
-    std::string MADDF_S(uint64 instruction);
-    std::string MADDU_DSP_(uint64 instruction);
-    std::string MAQ_S_W_PHL(uint64 instruction);
-    std::string MAQ_S_W_PHR(uint64 instruction);
-    std::string MAQ_SA_W_PHL(uint64 instruction);
-    std::string MAQ_SA_W_PHR(uint64 instruction);
-    std::string MAX_D(uint64 instruction);
-    std::string MAX_S(uint64 instruction);
-    std::string MAXA_D(uint64 instruction);
-    std::string MAXA_S(uint64 instruction);
-    std::string MFC0(uint64 instruction);
-    std::string MFC1(uint64 instruction);
-    std::string MFC2(uint64 instruction);
-    std::string MFGC0(uint64 instruction);
-    std::string MFHC0(uint64 instruction);
-    std::string MFHC1(uint64 instruction);
-    std::string MFHC2(uint64 instruction);
-    std::string MFHGC0(uint64 instruction);
-    std::string MFHI_DSP_(uint64 instruction);
-    std::string MFHTR(uint64 instruction);
-    std::string MFLO_DSP_(uint64 instruction);
-    std::string MFTR(uint64 instruction);
-    std::string MIN_D(uint64 instruction);
-    std::string MIN_S(uint64 instruction);
-    std::string MINA_D(uint64 instruction);
-    std::string MINA_S(uint64 instruction);
-    std::string MOD(uint64 instruction);
-    std::string MODSUB(uint64 instruction);
-    std::string MODU(uint64 instruction);
-    std::string MOV_D(uint64 instruction);
-    std::string MOV_S(uint64 instruction);
-    std::string MOVE_BALC(uint64 instruction);
-    std::string MOVEP(uint64 instruction);
-    std::string MOVEP_REV_(uint64 instruction);
-    std::string MOVE(uint64 instruction);
-    std::string MOVN(uint64 instruction);
-    std::string MOVZ(uint64 instruction);
-    std::string MSUB_DSP_(uint64 instruction);
-    std::string MSUBF_D(uint64 instruction);
-    std::string MSUBF_S(uint64 instruction);
-    std::string MSUBU_DSP_(uint64 instruction);
-    std::string MTC0(uint64 instruction);
-    std::string MTC1(uint64 instruction);
-    std::string MTC2(uint64 instruction);
-    std::string MTGC0(uint64 instruction);
-    std::string MTHC0(uint64 instruction);
-    std::string MTHC1(uint64 instruction);
-    std::string MTHC2(uint64 instruction);
-    std::string MTHGC0(uint64 instruction);
-    std::string MTHI_DSP_(uint64 instruction);
-    std::string MTHLIP(uint64 instruction);
-    std::string MTHTR(uint64 instruction);
-    std::string MTLO_DSP_(uint64 instruction);
-    std::string MTTR(uint64 instruction);
-    std::string MUH(uint64 instruction);
-    std::string MUHU(uint64 instruction);
-    std::string MUL_32_(uint64 instruction);
-    std::string MUL_4X4_(uint64 instruction);
-    std::string MUL_D(uint64 instruction);
-    std::string MUL_PH(uint64 instruction);
-    std::string MUL_S(uint64 instruction);
-    std::string MUL_S_PH(uint64 instruction);
-    std::string MULEQ_S_W_PHL(uint64 instruction);
-    std::string MULEQ_S_W_PHR(uint64 instruction);
-    std::string MULEU_S_PH_QBL(uint64 instruction);
-    std::string MULEU_S_PH_QBR(uint64 instruction);
-    std::string MULQ_RS_PH(uint64 instruction);
-    std::string MULQ_RS_W(uint64 instruction);
-    std::string MULQ_S_PH(uint64 instruction);
-    std::string MULQ_S_W(uint64 instruction);
-    std::string MULSA_W_PH(uint64 instruction);
-    std::string MULSAQ_S_W_PH(uint64 instruction);
-    std::string MULT_DSP_(uint64 instruction);
-    std::string MULTU_DSP_(uint64 instruction);
-    std::string MULU(uint64 instruction);
-    std::string NEG_D(uint64 instruction);
-    std::string NEG_S(uint64 instruction);
-    std::string NOP_16_(uint64 instruction);
-    std::string NOP_32_(uint64 instruction);
-    std::string NOR(uint64 instruction);
-    std::string NOT_16_(uint64 instruction);
-    std::string OR_16_(uint64 instruction);
-    std::string OR_32_(uint64 instruction);
-    std::string ORI(uint64 instruction);
-    std::string PACKRL_PH(uint64 instruction);
-    std::string PAUSE(uint64 instruction);
-    std::string PICK_PH(uint64 instruction);
-    std::string PICK_QB(uint64 instruction);
-    std::string PRECEQ_W_PHL(uint64 instruction);
-    std::string PRECEQ_W_PHR(uint64 instruction);
-    std::string PRECEQU_PH_QBL(uint64 instruction);
-    std::string PRECEQU_PH_QBLA(uint64 instruction);
-    std::string PRECEQU_PH_QBR(uint64 instruction);
-    std::string PRECEQU_PH_QBRA(uint64 instruction);
-    std::string PRECEU_PH_QBL(uint64 instruction);
-    std::string PRECEU_PH_QBLA(uint64 instruction);
-    std::string PRECEU_PH_QBR(uint64 instruction);
-    std::string PRECEU_PH_QBRA(uint64 instruction);
-    std::string PRECR_QB_PH(uint64 instruction);
-    std::string PRECR_SRA_PH_W(uint64 instruction);
-    std::string PRECR_SRA_R_PH_W(uint64 instruction);
-    std::string PRECRQ_PH_W(uint64 instruction);
-    std::string PRECRQ_QB_PH(uint64 instruction);
-    std::string PRECRQ_RS_PH_W(uint64 instruction);
-    std::string PRECRQU_S_QB_PH(uint64 instruction);
-    std::string PREF_S9_(uint64 instruction);
-    std::string PREF_U12_(uint64 instruction);
-    std::string PREFE(uint64 instruction);
-    std::string PREPEND(uint64 instruction);
-    std::string RADDU_W_QB(uint64 instruction);
-    std::string RDDSP(uint64 instruction);
-    std::string RDHWR(uint64 instruction);
-    std::string RDPGPR(uint64 instruction);
-    std::string RECIP_D(uint64 instruction);
-    std::string RECIP_S(uint64 instruction);
-    std::string REPL_PH(uint64 instruction);
-    std::string REPL_QB(uint64 instruction);
-    std::string REPLV_PH(uint64 instruction);
-    std::string REPLV_QB(uint64 instruction);
-    std::string RESTORE_32_(uint64 instruction);
-    std::string RESTORE_JRC_16_(uint64 instruction);
-    std::string RESTORE_JRC_32_(uint64 instruction);
-    std::string RESTOREF(uint64 instruction);
-    std::string RINT_D(uint64 instruction);
-    std::string RINT_S(uint64 instruction);
-    std::string ROTR(uint64 instruction);
-    std::string ROTRV(uint64 instruction);
-    std::string ROTX(uint64 instruction);
-    std::string ROUND_L_D(uint64 instruction);
-    std::string ROUND_L_S(uint64 instruction);
-    std::string ROUND_W_D(uint64 instruction);
-    std::string ROUND_W_S(uint64 instruction);
-    std::string RSQRT_D(uint64 instruction);
-    std::string RSQRT_S(uint64 instruction);
-    std::string SAVE_16_(uint64 instruction);
-    std::string SAVE_32_(uint64 instruction);
-    std::string SAVEF(uint64 instruction);
-    std::string SB_16_(uint64 instruction);
-    std::string SB_GP_(uint64 instruction);
-    std::string SB_S9_(uint64 instruction);
-    std::string SB_U12_(uint64 instruction);
-    std::string SBE(uint64 instruction);
-    std::string SBX(uint64 instruction);
-    std::string SC(uint64 instruction);
-    std::string SCD(uint64 instruction);
-    std::string SCDP(uint64 instruction);
-    std::string SCE(uint64 instruction);
-    std::string SCWP(uint64 instruction);
-    std::string SCWPE(uint64 instruction);
-    std::string SD_GP_(uint64 instruction);
-    std::string SD_S9_(uint64 instruction);
-    std::string SD_U12_(uint64 instruction);
-    std::string SDBBP_16_(uint64 instruction);
-    std::string SDBBP_32_(uint64 instruction);
-    std::string SDC1_GP_(uint64 instruction);
-    std::string SDC1_S9_(uint64 instruction);
-    std::string SDC1_U12_(uint64 instruction);
-    std::string SDC1X(uint64 instruction);
-    std::string SDC1XS(uint64 instruction);
-    std::string SDC2(uint64 instruction);
-    std::string SDM(uint64 instruction);
-    std::string SDPC_48_(uint64 instruction);
-    std::string SDX(uint64 instruction);
-    std::string SDXS(uint64 instruction);
-    std::string SEB(uint64 instruction);
-    std::string SEH(uint64 instruction);
-    std::string SEL_D(uint64 instruction);
-    std::string SEL_S(uint64 instruction);
-    std::string SELEQZ_D(uint64 instruction);
-    std::string SELEQZ_S(uint64 instruction);
-    std::string SELNEZ_D(uint64 instruction);
-    std::string SELNEZ_S(uint64 instruction);
-    std::string SEQI(uint64 instruction);
-    std::string SH_16_(uint64 instruction);
-    std::string SH_GP_(uint64 instruction);
-    std::string SH_S9_(uint64 instruction);
-    std::string SH_U12_(uint64 instruction);
-    std::string SHE(uint64 instruction);
-    std::string SHILO(uint64 instruction);
-    std::string SHILOV(uint64 instruction);
-    std::string SHLL_PH(uint64 instruction);
-    std::string SHLL_QB(uint64 instruction);
-    std::string SHLL_S_PH(uint64 instruction);
-    std::string SHLL_S_W(uint64 instruction);
-    std::string SHLLV_PH(uint64 instruction);
-    std::string SHLLV_QB(uint64 instruction);
-    std::string SHLLV_S_PH(uint64 instruction);
-    std::string SHLLV_S_W(uint64 instruction);
-    std::string SHRA_PH(uint64 instruction);
-    std::string SHRA_QB(uint64 instruction);
-    std::string SHRA_R_PH(uint64 instruction);
-    std::string SHRA_R_QB(uint64 instruction);
-    std::string SHRA_R_W(uint64 instruction);
-    std::string SHRAV_PH(uint64 instruction);
-    std::string SHRAV_QB(uint64 instruction);
-    std::string SHRAV_R_PH(uint64 instruction);
-    std::string SHRAV_R_QB(uint64 instruction);
-    std::string SHRAV_R_W(uint64 instruction);
-    std::string SHRL_PH(uint64 instruction);
-    std::string SHRL_QB(uint64 instruction);
-    std::string SHRLV_PH(uint64 instruction);
-    std::string SHRLV_QB(uint64 instruction);
-    std::string SHX(uint64 instruction);
-    std::string SHXS(uint64 instruction);
-    std::string SIGRIE(uint64 instruction);
-    std::string SLL_16_(uint64 instruction);
-    std::string SLL_32_(uint64 instruction);
-    std::string SLLV(uint64 instruction);
-    std::string SLT(uint64 instruction);
-    std::string SLTI(uint64 instruction);
-    std::string SLTIU(uint64 instruction);
-    std::string SLTU(uint64 instruction);
-    std::string SOV(uint64 instruction);
-    std::string SPECIAL2(uint64 instruction);
-    std::string SQRT_D(uint64 instruction);
-    std::string SQRT_S(uint64 instruction);
-    std::string SRA(uint64 instruction);
-    std::string SRAV(uint64 instruction);
-    std::string SRL_16_(uint64 instruction);
-    std::string SRL_32_(uint64 instruction);
-    std::string SRLV(uint64 instruction);
-    std::string SUB(uint64 instruction);
-    std::string SUB_D(uint64 instruction);
-    std::string SUB_S(uint64 instruction);
-    std::string SUBQ_PH(uint64 instruction);
-    std::string SUBQ_S_PH(uint64 instruction);
-    std::string SUBQ_S_W(uint64 instruction);
-    std::string SUBQH_PH(uint64 instruction);
-    std::string SUBQH_R_PH(uint64 instruction);
-    std::string SUBQH_R_W(uint64 instruction);
-    std::string SUBQH_W(uint64 instruction);
-    std::string SUBU_16_(uint64 instruction);
-    std::string SUBU_32_(uint64 instruction);
-    std::string SUBU_PH(uint64 instruction);
-    std::string SUBU_QB(uint64 instruction);
-    std::string SUBU_S_PH(uint64 instruction);
-    std::string SUBU_S_QB(uint64 instruction);
-    std::string SUBUH_QB(uint64 instruction);
-    std::string SUBUH_R_QB(uint64 instruction);
-    std::string SW_16_(uint64 instruction);
-    std::string SW_4X4_(uint64 instruction);
-    std::string SW_GP16_(uint64 instruction);
-    std::string SW_GP_(uint64 instruction);
-    std::string SW_S9_(uint64 instruction);
-    std::string SW_SP_(uint64 instruction);
-    std::string SW_U12_(uint64 instruction);
-    std::string SWC1_GP_(uint64 instruction);
-    std::string SWC1_S9_(uint64 instruction);
-    std::string SWC1_U12_(uint64 instruction);
-    std::string SWC1X(uint64 instruction);
-    std::string SWC1XS(uint64 instruction);
-    std::string SWC2(uint64 instruction);
-    std::string SWE(uint64 instruction);
-    std::string SWM(uint64 instruction);
-    std::string SWPC_48_(uint64 instruction);
-    std::string SWX(uint64 instruction);
-    std::string SWXS(uint64 instruction);
-    std::string SYNC(uint64 instruction);
-    std::string SYNCI(uint64 instruction);
-    std::string SYNCIE(uint64 instruction);
-    std::string SYSCALL_16_(uint64 instruction);
-    std::string SYSCALL_32_(uint64 instruction);
-    std::string TEQ(uint64 instruction);
-    std::string TLBGINV(uint64 instruction);
-    std::string TLBGINVF(uint64 instruction);
-    std::string TLBGP(uint64 instruction);
-    std::string TLBGR(uint64 instruction);
-    std::string TLBGWI(uint64 instruction);
-    std::string TLBGWR(uint64 instruction);
-    std::string TLBINV(uint64 instruction);
-    std::string TLBINVF(uint64 instruction);
-    std::string TLBP(uint64 instruction);
-    std::string TLBR(uint64 instruction);
-    std::string TLBWI(uint64 instruction);
-    std::string TLBWR(uint64 instruction);
-    std::string TNE(uint64 instruction);
-    std::string TRUNC_L_D(uint64 instruction);
-    std::string TRUNC_L_S(uint64 instruction);
-    std::string TRUNC_W_D(uint64 instruction);
-    std::string TRUNC_W_S(uint64 instruction);
-    std::string UALDM(uint64 instruction);
-    std::string UALH(uint64 instruction);
-    std::string UALWM(uint64 instruction);
-    std::string UASDM(uint64 instruction);
-    std::string UASH(uint64 instruction);
-    std::string UASWM(uint64 instruction);
-    std::string UDI(uint64 instruction);
-    std::string WAIT(uint64 instruction);
-    std::string WRDSP(uint64 instruction);
-    std::string WRPGPR(uint64 instruction);
-    std::string XOR_16_(uint64 instruction);
-    std::string XOR_32_(uint64 instruction);
-    std::string XORI(uint64 instruction);
-    std::string YIELD(uint64 instruction);
+    std::string ABS_D(uint64_t instruction);
+    std::string ABS_S(uint64_t instruction);
+    std::string ABSQ_S_PH(uint64_t instruction);
+    std::string ABSQ_S_QB(uint64_t instruction);
+    std::string ABSQ_S_W(uint64_t instruction);
+    std::string ACLR(uint64_t instruction);
+    std::string ADD(uint64_t instruction);
+    std::string ADD_D(uint64_t instruction);
+    std::string ADD_S(uint64_t instruction);
+    std::string ADDIU_32_(uint64_t instruction);
+    std::string ADDIU_48_(uint64_t instruction);
+    std::string ADDIU_GP48_(uint64_t instruction);
+    std::string ADDIU_GP_B_(uint64_t instruction);
+    std::string ADDIU_GP_W_(uint64_t instruction);
+    std::string ADDIU_NEG_(uint64_t instruction);
+    std::string ADDIU_R1_SP_(uint64_t instruction);
+    std::string ADDIU_R2_(uint64_t instruction);
+    std::string ADDIU_RS5_(uint64_t instruction);
+    std::string ADDIUPC_32_(uint64_t instruction);
+    std::string ADDIUPC_48_(uint64_t instruction);
+    std::string ADDQ_PH(uint64_t instruction);
+    std::string ADDQ_S_PH(uint64_t instruction);
+    std::string ADDQ_S_W(uint64_t instruction);
+    std::string ADDQH_PH(uint64_t instruction);
+    std::string ADDQH_R_PH(uint64_t instruction);
+    std::string ADDQH_R_W(uint64_t instruction);
+    std::string ADDQH_W(uint64_t instruction);
+    std::string ADDSC(uint64_t instruction);
+    std::string ADDU_16_(uint64_t instruction);
+    std::string ADDU_32_(uint64_t instruction);
+    std::string ADDU_4X4_(uint64_t instruction);
+    std::string ADDU_PH(uint64_t instruction);
+    std::string ADDU_QB(uint64_t instruction);
+    std::string ADDU_S_PH(uint64_t instruction);
+    std::string ADDU_S_QB(uint64_t instruction);
+    std::string ADDUH_QB(uint64_t instruction);
+    std::string ADDUH_R_QB(uint64_t instruction);
+    std::string ADDWC(uint64_t instruction);
+    std::string ALUIPC(uint64_t instruction);
+    std::string AND_16_(uint64_t instruction);
+    std::string AND_32_(uint64_t instruction);
+    std::string ANDI_16_(uint64_t instruction);
+    std::string ANDI_32_(uint64_t instruction);
+    std::string APPEND(uint64_t instruction);
+    std::string ASET(uint64_t instruction);
+    std::string BALC_16_(uint64_t instruction);
+    std::string BALC_32_(uint64_t instruction);
+    std::string BALRSC(uint64_t instruction);
+    std::string BBEQZC(uint64_t instruction);
+    std::string BBNEZC(uint64_t instruction);
+    std::string BC_16_(uint64_t instruction);
+    std::string BC_32_(uint64_t instruction);
+    std::string BC1EQZC(uint64_t instruction);
+    std::string BC1NEZC(uint64_t instruction);
+    std::string BC2EQZC(uint64_t instruction);
+    std::string BC2NEZC(uint64_t instruction);
+    std::string BEQC_16_(uint64_t instruction);
+    std::string BEQC_32_(uint64_t instruction);
+    std::string BEQIC(uint64_t instruction);
+    std::string BEQZC_16_(uint64_t instruction);
+    std::string BGEC(uint64_t instruction);
+    std::string BGEIC(uint64_t instruction);
+    std::string BGEIUC(uint64_t instruction);
+    std::string BGEUC(uint64_t instruction);
+    std::string BLTC(uint64_t instruction);
+    std::string BLTIC(uint64_t instruction);
+    std::string BLTIUC(uint64_t instruction);
+    std::string BLTUC(uint64_t instruction);
+    std::string BNEC_16_(uint64_t instruction);
+    std::string BNEC_32_(uint64_t instruction);
+    std::string BNEIC(uint64_t instruction);
+    std::string BNEZC_16_(uint64_t instruction);
+    std::string BPOSGE32C(uint64_t instruction);
+    std::string BREAK_16_(uint64_t instruction);
+    std::string BREAK_32_(uint64_t instruction);
+    std::string BRSC(uint64_t instruction);
+    std::string CACHE(uint64_t instruction);
+    std::string CACHEE(uint64_t instruction);
+    std::string CEIL_L_D(uint64_t instruction);
+    std::string CEIL_L_S(uint64_t instruction);
+    std::string CEIL_W_D(uint64_t instruction);
+    std::string CEIL_W_S(uint64_t instruction);
+    std::string CFC1(uint64_t instruction);
+    std::string CFC2(uint64_t instruction);
+    std::string CLASS_D(uint64_t instruction);
+    std::string CLASS_S(uint64_t instruction);
+    std::string CLO(uint64_t instruction);
+    std::string CLZ(uint64_t instruction);
+    std::string CMP_AF_D(uint64_t instruction);
+    std::string CMP_AF_S(uint64_t instruction);
+    std::string CMP_EQ_D(uint64_t instruction);
+    std::string CMP_EQ_PH(uint64_t instruction);
+    std::string CMP_EQ_S(uint64_t instruction);
+    std::string CMP_LE_D(uint64_t instruction);
+    std::string CMP_LE_PH(uint64_t instruction);
+    std::string CMP_LE_S(uint64_t instruction);
+    std::string CMP_LT_D(uint64_t instruction);
+    std::string CMP_LT_PH(uint64_t instruction);
+    std::string CMP_LT_S(uint64_t instruction);
+    std::string CMP_NE_D(uint64_t instruction);
+    std::string CMP_NE_S(uint64_t instruction);
+    std::string CMP_OR_D(uint64_t instruction);
+    std::string CMP_OR_S(uint64_t instruction);
+    std::string CMP_SAF_D(uint64_t instruction);
+    std::string CMP_SAF_S(uint64_t instruction);
+    std::string CMP_SEQ_D(uint64_t instruction);
+    std::string CMP_SEQ_S(uint64_t instruction);
+    std::string CMP_SLE_D(uint64_t instruction);
+    std::string CMP_SLE_S(uint64_t instruction);
+    std::string CMP_SLT_D(uint64_t instruction);
+    std::string CMP_SLT_S(uint64_t instruction);
+    std::string CMP_SNE_D(uint64_t instruction);
+    std::string CMP_SNE_S(uint64_t instruction);
+    std::string CMP_SOR_D(uint64_t instruction);
+    std::string CMP_SOR_S(uint64_t instruction);
+    std::string CMP_SUEQ_D(uint64_t instruction);
+    std::string CMP_SUEQ_S(uint64_t instruction);
+    std::string CMP_SULE_D(uint64_t instruction);
+    std::string CMP_SULE_S(uint64_t instruction);
+    std::string CMP_SULT_D(uint64_t instruction);
+    std::string CMP_SULT_S(uint64_t instruction);
+    std::string CMP_SUN_D(uint64_t instruction);
+    std::string CMP_SUN_S(uint64_t instruction);
+    std::string CMP_SUNE_D(uint64_t instruction);
+    std::string CMP_SUNE_S(uint64_t instruction);
+    std::string CMP_UEQ_D(uint64_t instruction);
+    std::string CMP_UEQ_S(uint64_t instruction);
+    std::string CMP_ULE_D(uint64_t instruction);
+    std::string CMP_ULE_S(uint64_t instruction);
+    std::string CMP_ULT_D(uint64_t instruction);
+    std::string CMP_ULT_S(uint64_t instruction);
+    std::string CMP_UN_D(uint64_t instruction);
+    std::string CMP_UN_S(uint64_t instruction);
+    std::string CMP_UNE_D(uint64_t instruction);
+    std::string CMP_UNE_S(uint64_t instruction);
+    std::string CMPGDU_EQ_QB(uint64_t instruction);
+    std::string CMPGDU_LE_QB(uint64_t instruction);
+    std::string CMPGDU_LT_QB(uint64_t instruction);
+    std::string CMPGU_EQ_QB(uint64_t instruction);
+    std::string CMPGU_LE_QB(uint64_t instruction);
+    std::string CMPGU_LT_QB(uint64_t instruction);
+    std::string CMPU_EQ_QB(uint64_t instruction);
+    std::string CMPU_LE_QB(uint64_t instruction);
+    std::string CMPU_LT_QB(uint64_t instruction);
+    std::string COP2_1(uint64_t instruction);
+    std::string CTC1(uint64_t instruction);
+    std::string CTC2(uint64_t instruction);
+    std::string CVT_D_L(uint64_t instruction);
+    std::string CVT_D_S(uint64_t instruction);
+    std::string CVT_D_W(uint64_t instruction);
+    std::string CVT_L_D(uint64_t instruction);
+    std::string CVT_L_S(uint64_t instruction);
+    std::string CVT_S_D(uint64_t instruction);
+    std::string CVT_S_L(uint64_t instruction);
+    std::string CVT_S_PL(uint64_t instruction);
+    std::string CVT_S_PU(uint64_t instruction);
+    std::string CVT_S_W(uint64_t instruction);
+    std::string CVT_W_D(uint64_t instruction);
+    std::string CVT_W_S(uint64_t instruction);
+    std::string DADDIU_48_(uint64_t instruction);
+    std::string DADDIU_NEG_(uint64_t instruction);
+    std::string DADDIU_U12_(uint64_t instruction);
+    std::string DADD(uint64_t instruction);
+    std::string DADDU(uint64_t instruction);
+    std::string DCLO(uint64_t instruction);
+    std::string DCLZ(uint64_t instruction);
+    std::string DDIV(uint64_t instruction);
+    std::string DDIVU(uint64_t instruction);
+    std::string DERET(uint64_t instruction);
+    std::string DEXTM(uint64_t instruction);
+    std::string DEXT(uint64_t instruction);
+    std::string DEXTU(uint64_t instruction);
+    std::string DINSM(uint64_t instruction);
+    std::string DINS(uint64_t instruction);
+    std::string DINSU(uint64_t instruction);
+    std::string DI(uint64_t instruction);
+    std::string DIV(uint64_t instruction);
+    std::string DIV_D(uint64_t instruction);
+    std::string DIV_S(uint64_t instruction);
+    std::string DIVU(uint64_t instruction);
+    std::string DLSA(uint64_t instruction);
+    std::string DLUI_48_(uint64_t instruction);
+    std::string DMFC0(uint64_t instruction);
+    std::string DMFC1(uint64_t instruction);
+    std::string DMFC2(uint64_t instruction);
+    std::string DMFGC0(uint64_t instruction);
+    std::string DMOD(uint64_t instruction);
+    std::string DMODU(uint64_t instruction);
+    std::string DMTC0(uint64_t instruction);
+    std::string DMTC1(uint64_t instruction);
+    std::string DMTC2(uint64_t instruction);
+    std::string DMTGC0(uint64_t instruction);
+    std::string DMT(uint64_t instruction);
+    std::string DMUH(uint64_t instruction);
+    std::string DMUHU(uint64_t instruction);
+    std::string DMUL(uint64_t instruction);
+    std::string DMULU(uint64_t instruction);
+    std::string DPAQ_S_W_PH(uint64_t instruction);
+    std::string DPAQ_SA_L_W(uint64_t instruction);
+    std::string DPAQX_S_W_PH(uint64_t instruction);
+    std::string DPAQX_SA_W_PH(uint64_t instruction);
+    std::string DPAU_H_QBL(uint64_t instruction);
+    std::string DPAU_H_QBR(uint64_t instruction);
+    std::string DPA_W_PH(uint64_t instruction);
+    std::string DPAX_W_PH(uint64_t instruction);
+    std::string DPS_W_PH(uint64_t instruction);
+    std::string DPSQ_SA_L_W(uint64_t instruction);
+    std::string DPSQ_S_W_PH(uint64_t instruction);
+    std::string DPSQX_SA_W_PH(uint64_t instruction);
+    std::string DPSQX_S_W_PH(uint64_t instruction);
+    std::string DPSU_H_QBL(uint64_t instruction);
+    std::string DPSU_H_QBR(uint64_t instruction);
+    std::string DPSX_W_PH(uint64_t instruction);
+    std::string DROTR(uint64_t instruction);
+    std::string DROTR32(uint64_t instruction);
+    std::string DROTRV(uint64_t instruction);
+    std::string DROTX(uint64_t instruction);
+    std::string DSLL(uint64_t instruction);
+    std::string DSLL32(uint64_t instruction);
+    std::string DSLLV(uint64_t instruction);
+    std::string DSRA(uint64_t instruction);
+    std::string DSRA32(uint64_t instruction);
+    std::string DSRAV(uint64_t instruction);
+    std::string DSRL32(uint64_t instruction);
+    std::string DSRL(uint64_t instruction);
+    std::string DSRLV(uint64_t instruction);
+    std::string DSUB(uint64_t instruction);
+    std::string DSUBU(uint64_t instruction);
+    std::string DVP(uint64_t instruction);
+    std::string DVPE(uint64_t instruction);
+    std::string EHB(uint64_t instruction);
+    std::string EI(uint64_t instruction);
+    std::string EMT(uint64_t instruction);
+    std::string ERET(uint64_t instruction);
+    std::string ERETNC(uint64_t instruction);
+    std::string EVP(uint64_t instruction);
+    std::string EVPE(uint64_t instruction);
+    std::string EXT(uint64_t instruction);
+    std::string EXTD(uint64_t instruction);
+    std::string EXTD32(uint64_t instruction);
+    std::string EXTP(uint64_t instruction);
+    std::string EXTPDP(uint64_t instruction);
+    std::string EXTPDPV(uint64_t instruction);
+    std::string EXTPV(uint64_t instruction);
+    std::string EXTR_RS_W(uint64_t instruction);
+    std::string EXTR_R_W(uint64_t instruction);
+    std::string EXTR_S_H(uint64_t instruction);
+    std::string EXTR_W(uint64_t instruction);
+    std::string EXTRV_R_W(uint64_t instruction);
+    std::string EXTRV_RS_W(uint64_t instruction);
+    std::string EXTRV_S_H(uint64_t instruction);
+    std::string EXTRV_W(uint64_t instruction);
+    std::string EXTW(uint64_t instruction);
+    std::string FLOOR_L_D(uint64_t instruction);
+    std::string FLOOR_L_S(uint64_t instruction);
+    std::string FLOOR_W_D(uint64_t instruction);
+    std::string FLOOR_W_S(uint64_t instruction);
+    std::string FORK(uint64_t instruction);
+    std::string HYPCALL(uint64_t instruction);
+    std::string HYPCALL_16_(uint64_t instruction);
+    std::string INS(uint64_t instruction);
+    std::string INSV(uint64_t instruction);
+    std::string IRET(uint64_t instruction);
+    std::string JALRC_16_(uint64_t instruction);
+    std::string JALRC_32_(uint64_t instruction);
+    std::string JALRC_HB(uint64_t instruction);
+    std::string JRC(uint64_t instruction);
+    std::string LB_16_(uint64_t instruction);
+    std::string LB_GP_(uint64_t instruction);
+    std::string LB_S9_(uint64_t instruction);
+    std::string LB_U12_(uint64_t instruction);
+    std::string LBE(uint64_t instruction);
+    std::string LBU_16_(uint64_t instruction);
+    std::string LBU_GP_(uint64_t instruction);
+    std::string LBU_S9_(uint64_t instruction);
+    std::string LBU_U12_(uint64_t instruction);
+    std::string LBUE(uint64_t instruction);
+    std::string LBUX(uint64_t instruction);
+    std::string LBX(uint64_t instruction);
+    std::string LD_GP_(uint64_t instruction);
+    std::string LD_S9_(uint64_t instruction);
+    std::string LD_U12_(uint64_t instruction);
+    std::string LDC1_GP_(uint64_t instruction);
+    std::string LDC1_S9_(uint64_t instruction);
+    std::string LDC1_U12_(uint64_t instruction);
+    std::string LDC1X(uint64_t instruction);
+    std::string LDC1XS(uint64_t instruction);
+    std::string LDC2(uint64_t instruction);
+    std::string LDM(uint64_t instruction);
+    std::string LDPC_48_(uint64_t instruction);
+    std::string LDX(uint64_t instruction);
+    std::string LDXS(uint64_t instruction);
+    std::string LH_16_(uint64_t instruction);
+    std::string LH_GP_(uint64_t instruction);
+    std::string LH_S9_(uint64_t instruction);
+    std::string LH_U12_(uint64_t instruction);
+    std::string LHE(uint64_t instruction);
+    std::string LHU_16_(uint64_t instruction);
+    std::string LHU_GP_(uint64_t instruction);
+    std::string LHU_S9_(uint64_t instruction);
+    std::string LHU_U12_(uint64_t instruction);
+    std::string LHUE(uint64_t instruction);
+    std::string LHUX(uint64_t instruction);
+    std::string LHUXS(uint64_t instruction);
+    std::string LHX(uint64_t instruction);
+    std::string LHXS(uint64_t instruction);
+    std::string LI_16_(uint64_t instruction);
+    std::string LI_48_(uint64_t instruction);
+    std::string LL(uint64_t instruction);
+    std::string LLD(uint64_t instruction);
+    std::string LLDP(uint64_t instruction);
+    std::string LLE(uint64_t instruction);
+    std::string LLWP(uint64_t instruction);
+    std::string LLWPE(uint64_t instruction);
+    std::string LSA(uint64_t instruction);
+    std::string LUI(uint64_t instruction);
+    std::string LW_16_(uint64_t instruction);
+    std::string LW_4X4_(uint64_t instruction);
+    std::string LWC1_GP_(uint64_t instruction);
+    std::string LWC1_S9_(uint64_t instruction);
+    std::string LWC1_U12_(uint64_t instruction);
+    std::string LWC1X(uint64_t instruction);
+    std::string LWC1XS(uint64_t instruction);
+    std::string LWC2(uint64_t instruction);
+    std::string LWE(uint64_t instruction);
+    std::string LW_GP_(uint64_t instruction);
+    std::string LW_GP16_(uint64_t instruction);
+    std::string LWM(uint64_t instruction);
+    std::string LWPC_48_(uint64_t instruction);
+    std::string LW_S9_(uint64_t instruction);
+    std::string LW_SP_(uint64_t instruction);
+    std::string LW_U12_(uint64_t instruction);
+    std::string LWU_GP_(uint64_t instruction);
+    std::string LWU_S9_(uint64_t instruction);
+    std::string LWU_U12_(uint64_t instruction);
+    std::string LWUX(uint64_t instruction);
+    std::string LWUXS(uint64_t instruction);
+    std::string LWX(uint64_t instruction);
+    std::string LWXS_16_(uint64_t instruction);
+    std::string LWXS_32_(uint64_t instruction);
+    std::string MADD_DSP_(uint64_t instruction);
+    std::string MADDF_D(uint64_t instruction);
+    std::string MADDF_S(uint64_t instruction);
+    std::string MADDU_DSP_(uint64_t instruction);
+    std::string MAQ_S_W_PHL(uint64_t instruction);
+    std::string MAQ_S_W_PHR(uint64_t instruction);
+    std::string MAQ_SA_W_PHL(uint64_t instruction);
+    std::string MAQ_SA_W_PHR(uint64_t instruction);
+    std::string MAX_D(uint64_t instruction);
+    std::string MAX_S(uint64_t instruction);
+    std::string MAXA_D(uint64_t instruction);
+    std::string MAXA_S(uint64_t instruction);
+    std::string MFC0(uint64_t instruction);
+    std::string MFC1(uint64_t instruction);
+    std::string MFC2(uint64_t instruction);
+    std::string MFGC0(uint64_t instruction);
+    std::string MFHC0(uint64_t instruction);
+    std::string MFHC1(uint64_t instruction);
+    std::string MFHC2(uint64_t instruction);
+    std::string MFHGC0(uint64_t instruction);
+    std::string MFHI_DSP_(uint64_t instruction);
+    std::string MFHTR(uint64_t instruction);
+    std::string MFLO_DSP_(uint64_t instruction);
+    std::string MFTR(uint64_t instruction);
+    std::string MIN_D(uint64_t instruction);
+    std::string MIN_S(uint64_t instruction);
+    std::string MINA_D(uint64_t instruction);
+    std::string MINA_S(uint64_t instruction);
+    std::string MOD(uint64_t instruction);
+    std::string MODSUB(uint64_t instruction);
+    std::string MODU(uint64_t instruction);
+    std::string MOV_D(uint64_t instruction);
+    std::string MOV_S(uint64_t instruction);
+    std::string MOVE_BALC(uint64_t instruction);
+    std::string MOVEP(uint64_t instruction);
+    std::string MOVEP_REV_(uint64_t instruction);
+    std::string MOVE(uint64_t instruction);
+    std::string MOVN(uint64_t instruction);
+    std::string MOVZ(uint64_t instruction);
+    std::string MSUB_DSP_(uint64_t instruction);
+    std::string MSUBF_D(uint64_t instruction);
+    std::string MSUBF_S(uint64_t instruction);
+    std::string MSUBU_DSP_(uint64_t instruction);
+    std::string MTC0(uint64_t instruction);
+    std::string MTC1(uint64_t instruction);
+    std::string MTC2(uint64_t instruction);
+    std::string MTGC0(uint64_t instruction);
+    std::string MTHC0(uint64_t instruction);
+    std::string MTHC1(uint64_t instruction);
+    std::string MTHC2(uint64_t instruction);
+    std::string MTHGC0(uint64_t instruction);
+    std::string MTHI_DSP_(uint64_t instruction);
+    std::string MTHLIP(uint64_t instruction);
+    std::string MTHTR(uint64_t instruction);
+    std::string MTLO_DSP_(uint64_t instruction);
+    std::string MTTR(uint64_t instruction);
+    std::string MUH(uint64_t instruction);
+    std::string MUHU(uint64_t instruction);
+    std::string MUL_32_(uint64_t instruction);
+    std::string MUL_4X4_(uint64_t instruction);
+    std::string MUL_D(uint64_t instruction);
+    std::string MUL_PH(uint64_t instruction);
+    std::string MUL_S(uint64_t instruction);
+    std::string MUL_S_PH(uint64_t instruction);
+    std::string MULEQ_S_W_PHL(uint64_t instruction);
+    std::string MULEQ_S_W_PHR(uint64_t instruction);
+    std::string MULEU_S_PH_QBL(uint64_t instruction);
+    std::string MULEU_S_PH_QBR(uint64_t instruction);
+    std::string MULQ_RS_PH(uint64_t instruction);
+    std::string MULQ_RS_W(uint64_t instruction);
+    std::string MULQ_S_PH(uint64_t instruction);
+    std::string MULQ_S_W(uint64_t instruction);
+    std::string MULSA_W_PH(uint64_t instruction);
+    std::string MULSAQ_S_W_PH(uint64_t instruction);
+    std::string MULT_DSP_(uint64_t instruction);
+    std::string MULTU_DSP_(uint64_t instruction);
+    std::string MULU(uint64_t instruction);
+    std::string NEG_D(uint64_t instruction);
+    std::string NEG_S(uint64_t instruction);
+    std::string NOP_16_(uint64_t instruction);
+    std::string NOP_32_(uint64_t instruction);
+    std::string NOR(uint64_t instruction);
+    std::string NOT_16_(uint64_t instruction);
+    std::string OR_16_(uint64_t instruction);
+    std::string OR_32_(uint64_t instruction);
+    std::string ORI(uint64_t instruction);
+    std::string PACKRL_PH(uint64_t instruction);
+    std::string PAUSE(uint64_t instruction);
+    std::string PICK_PH(uint64_t instruction);
+    std::string PICK_QB(uint64_t instruction);
+    std::string PRECEQ_W_PHL(uint64_t instruction);
+    std::string PRECEQ_W_PHR(uint64_t instruction);
+    std::string PRECEQU_PH_QBL(uint64_t instruction);
+    std::string PRECEQU_PH_QBLA(uint64_t instruction);
+    std::string PRECEQU_PH_QBR(uint64_t instruction);
+    std::string PRECEQU_PH_QBRA(uint64_t instruction);
+    std::string PRECEU_PH_QBL(uint64_t instruction);
+    std::string PRECEU_PH_QBLA(uint64_t instruction);
+    std::string PRECEU_PH_QBR(uint64_t instruction);
+    std::string PRECEU_PH_QBRA(uint64_t instruction);
+    std::string PRECR_QB_PH(uint64_t instruction);
+    std::string PRECR_SRA_PH_W(uint64_t instruction);
+    std::string PRECR_SRA_R_PH_W(uint64_t instruction);
+    std::string PRECRQ_PH_W(uint64_t instruction);
+    std::string PRECRQ_QB_PH(uint64_t instruction);
+    std::string PRECRQ_RS_PH_W(uint64_t instruction);
+    std::string PRECRQU_S_QB_PH(uint64_t instruction);
+    std::string PREF_S9_(uint64_t instruction);
+    std::string PREF_U12_(uint64_t instruction);
+    std::string PREFE(uint64_t instruction);
+    std::string PREPEND(uint64_t instruction);
+    std::string RADDU_W_QB(uint64_t instruction);
+    std::string RDDSP(uint64_t instruction);
+    std::string RDHWR(uint64_t instruction);
+    std::string RDPGPR(uint64_t instruction);
+    std::string RECIP_D(uint64_t instruction);
+    std::string RECIP_S(uint64_t instruction);
+    std::string REPL_PH(uint64_t instruction);
+    std::string REPL_QB(uint64_t instruction);
+    std::string REPLV_PH(uint64_t instruction);
+    std::string REPLV_QB(uint64_t instruction);
+    std::string RESTORE_32_(uint64_t instruction);
+    std::string RESTORE_JRC_16_(uint64_t instruction);
+    std::string RESTORE_JRC_32_(uint64_t instruction);
+    std::string RESTOREF(uint64_t instruction);
+    std::string RINT_D(uint64_t instruction);
+    std::string RINT_S(uint64_t instruction);
+    std::string ROTR(uint64_t instruction);
+    std::string ROTRV(uint64_t instruction);
+    std::string ROTX(uint64_t instruction);
+    std::string ROUND_L_D(uint64_t instruction);
+    std::string ROUND_L_S(uint64_t instruction);
+    std::string ROUND_W_D(uint64_t instruction);
+    std::string ROUND_W_S(uint64_t instruction);
+    std::string RSQRT_D(uint64_t instruction);
+    std::string RSQRT_S(uint64_t instruction);
+    std::string SAVE_16_(uint64_t instruction);
+    std::string SAVE_32_(uint64_t instruction);
+    std::string SAVEF(uint64_t instruction);
+    std::string SB_16_(uint64_t instruction);
+    std::string SB_GP_(uint64_t instruction);
+    std::string SB_S9_(uint64_t instruction);
+    std::string SB_U12_(uint64_t instruction);
+    std::string SBE(uint64_t instruction);
+    std::string SBX(uint64_t instruction);
+    std::string SC(uint64_t instruction);
+    std::string SCD(uint64_t instruction);
+    std::string SCDP(uint64_t instruction);
+    std::string SCE(uint64_t instruction);
+    std::string SCWP(uint64_t instruction);
+    std::string SCWPE(uint64_t instruction);
+    std::string SD_GP_(uint64_t instruction);
+    std::string SD_S9_(uint64_t instruction);
+    std::string SD_U12_(uint64_t instruction);
+    std::string SDBBP_16_(uint64_t instruction);
+    std::string SDBBP_32_(uint64_t instruction);
+    std::string SDC1_GP_(uint64_t instruction);
+    std::string SDC1_S9_(uint64_t instruction);
+    std::string SDC1_U12_(uint64_t instruction);
+    std::string SDC1X(uint64_t instruction);
+    std::string SDC1XS(uint64_t instruction);
+    std::string SDC2(uint64_t instruction);
+    std::string SDM(uint64_t instruction);
+    std::string SDPC_48_(uint64_t instruction);
+    std::string SDX(uint64_t instruction);
+    std::string SDXS(uint64_t instruction);
+    std::string SEB(uint64_t instruction);
+    std::string SEH(uint64_t instruction);
+    std::string SEL_D(uint64_t instruction);
+    std::string SEL_S(uint64_t instruction);
+    std::string SELEQZ_D(uint64_t instruction);
+    std::string SELEQZ_S(uint64_t instruction);
+    std::string SELNEZ_D(uint64_t instruction);
+    std::string SELNEZ_S(uint64_t instruction);
+    std::string SEQI(uint64_t instruction);
+    std::string SH_16_(uint64_t instruction);
+    std::string SH_GP_(uint64_t instruction);
+    std::string SH_S9_(uint64_t instruction);
+    std::string SH_U12_(uint64_t instruction);
+    std::string SHE(uint64_t instruction);
+    std::string SHILO(uint64_t instruction);
+    std::string SHILOV(uint64_t instruction);
+    std::string SHLL_PH(uint64_t instruction);
+    std::string SHLL_QB(uint64_t instruction);
+    std::string SHLL_S_PH(uint64_t instruction);
+    std::string SHLL_S_W(uint64_t instruction);
+    std::string SHLLV_PH(uint64_t instruction);
+    std::string SHLLV_QB(uint64_t instruction);
+    std::string SHLLV_S_PH(uint64_t instruction);
+    std::string SHLLV_S_W(uint64_t instruction);
+    std::string SHRA_PH(uint64_t instruction);
+    std::string SHRA_QB(uint64_t instruction);
+    std::string SHRA_R_PH(uint64_t instruction);
+    std::string SHRA_R_QB(uint64_t instruction);
+    std::string SHRA_R_W(uint64_t instruction);
+    std::string SHRAV_PH(uint64_t instruction);
+    std::string SHRAV_QB(uint64_t instruction);
+    std::string SHRAV_R_PH(uint64_t instruction);
+    std::string SHRAV_R_QB(uint64_t instruction);
+    std::string SHRAV_R_W(uint64_t instruction);
+    std::string SHRL_PH(uint64_t instruction);
+    std::string SHRL_QB(uint64_t instruction);
+    std::string SHRLV_PH(uint64_t instruction);
+    std::string SHRLV_QB(uint64_t instruction);
+    std::string SHX(uint64_t instruction);
+    std::string SHXS(uint64_t instruction);
+    std::string SIGRIE(uint64_t instruction);
+    std::string SLL_16_(uint64_t instruction);
+    std::string SLL_32_(uint64_t instruction);
+    std::string SLLV(uint64_t instruction);
+    std::string SLT(uint64_t instruction);
+    std::string SLTI(uint64_t instruction);
+    std::string SLTIU(uint64_t instruction);
+    std::string SLTU(uint64_t instruction);
+    std::string SOV(uint64_t instruction);
+    std::string SPECIAL2(uint64_t instruction);
+    std::string SQRT_D(uint64_t instruction);
+    std::string SQRT_S(uint64_t instruction);
+    std::string SRA(uint64_t instruction);
+    std::string SRAV(uint64_t instruction);
+    std::string SRL_16_(uint64_t instruction);
+    std::string SRL_32_(uint64_t instruction);
+    std::string SRLV(uint64_t instruction);
+    std::string SUB(uint64_t instruction);
+    std::string SUB_D(uint64_t instruction);
+    std::string SUB_S(uint64_t instruction);
+    std::string SUBQ_PH(uint64_t instruction);
+    std::string SUBQ_S_PH(uint64_t instruction);
+    std::string SUBQ_S_W(uint64_t instruction);
+    std::string SUBQH_PH(uint64_t instruction);
+    std::string SUBQH_R_PH(uint64_t instruction);
+    std::string SUBQH_R_W(uint64_t instruction);
+    std::string SUBQH_W(uint64_t instruction);
+    std::string SUBU_16_(uint64_t instruction);
+    std::string SUBU_32_(uint64_t instruction);
+    std::string SUBU_PH(uint64_t instruction);
+    std::string SUBU_QB(uint64_t instruction);
+    std::string SUBU_S_PH(uint64_t instruction);
+    std::string SUBU_S_QB(uint64_t instruction);
+    std::string SUBUH_QB(uint64_t instruction);
+    std::string SUBUH_R_QB(uint64_t instruction);
+    std::string SW_16_(uint64_t instruction);
+    std::string SW_4X4_(uint64_t instruction);
+    std::string SW_GP16_(uint64_t instruction);
+    std::string SW_GP_(uint64_t instruction);
+    std::string SW_S9_(uint64_t instruction);
+    std::string SW_SP_(uint64_t instruction);
+    std::string SW_U12_(uint64_t instruction);
+    std::string SWC1_GP_(uint64_t instruction);
+    std::string SWC1_S9_(uint64_t instruction);
+    std::string SWC1_U12_(uint64_t instruction);
+    std::string SWC1X(uint64_t instruction);
+    std::string SWC1XS(uint64_t instruction);
+    std::string SWC2(uint64_t instruction);
+    std::string SWE(uint64_t instruction);
+    std::string SWM(uint64_t instruction);
+    std::string SWPC_48_(uint64_t instruction);
+    std::string SWX(uint64_t instruction);
+    std::string SWXS(uint64_t instruction);
+    std::string SYNC(uint64_t instruction);
+    std::string SYNCI(uint64_t instruction);
+    std::string SYNCIE(uint64_t instruction);
+    std::string SYSCALL_16_(uint64_t instruction);
+    std::string SYSCALL_32_(uint64_t instruction);
+    std::string TEQ(uint64_t instruction);
+    std::string TLBGINV(uint64_t instruction);
+    std::string TLBGINVF(uint64_t instruction);
+    std::string TLBGP(uint64_t instruction);
+    std::string TLBGR(uint64_t instruction);
+    std::string TLBGWI(uint64_t instruction);
+    std::string TLBGWR(uint64_t instruction);
+    std::string TLBINV(uint64_t instruction);
+    std::string TLBINVF(uint64_t instruction);
+    std::string TLBP(uint64_t instruction);
+    std::string TLBR(uint64_t instruction);
+    std::string TLBWI(uint64_t instruction);
+    std::string TLBWR(uint64_t instruction);
+    std::string TNE(uint64_t instruction);
+    std::string TRUNC_L_D(uint64_t instruction);
+    std::string TRUNC_L_S(uint64_t instruction);
+    std::string TRUNC_W_D(uint64_t instruction);
+    std::string TRUNC_W_S(uint64_t instruction);
+    std::string UALDM(uint64_t instruction);
+    std::string UALH(uint64_t instruction);
+    std::string UALWM(uint64_t instruction);
+    std::string UASDM(uint64_t instruction);
+    std::string UASH(uint64_t instruction);
+    std::string UASWM(uint64_t instruction);
+    std::string UDI(uint64_t instruction);
+    std::string WAIT(uint64_t instruction);
+    std::string WRDSP(uint64_t instruction);
+    std::string WRPGPR(uint64_t instruction);
+    std::string XOR_16_(uint64_t instruction);
+    std::string XOR_32_(uint64_t instruction);
+    std::string XORI(uint64_t instruction);
+    std::string YIELD(uint64_t instruction);
 
     static Pool P_SYSCALL[2];
     static Pool P_RI[4];
-- 
2.11.0





reply via email to

[Prev in Thread] Current Thread [Next in Thread]