diff --git a/dynasm/dasm_s390x.lua b/dynasm/dasm_s390x.lua
index dc1f5e5d..a5f280d7 100644
--- a/dynasm/dasm_s390x.lua
+++ b/dynasm/dasm_s390x.lua
@@ -513,10 +513,12 @@ end
 
 local function parse_mask(mask)
   local m3 = parse_number(mask)
-  if ((m3 == 1) or (m3 == 0) or ( m3 >=3 and m3 <=7)) then
-    return m3
-  else
-    werror("Mask value should be 0,1 or 3-7: ", m3)
+  if m3 then
+    if ((m3 == 1) or (m3 == 0) or ( m3 >=3 and m3 <=7)) then
+      return m3
+    else
+      werror("Mask value should be 0,1 or 3-7: ", m3)
+    end
   end
 end
 
@@ -573,593 +575,594 @@ end
 
 -- Template strings for s390x instructions.
 map_op = {
-  a_2 =		"00005a000000j",
-  ar_2 =	"000000001a00g",
-  ay_2 =	"e3000000005al",
-  ag_2 =	"e30000000008l",
-  agr_2 =	"0000b9080000h",
-  agf_2 =	"e30000000018l",
-  agfr_2 =	"0000b9180000h",
-  axbr_2 =	"0000b34a0000h",
-  adbr_2 =	"0000b31a0000h",
-  aebr_2 =	"0000b30a0000h",
-  aghi_2 =	"0000a70b0000i",
-  ah_2 =	"00004a000000j",
-  ahi_2 =	"0000a70a0000i",
-  ahy_2 =	"e3000000007al",
-  afi_2 =	"c20900000000n",
-  agfi_2 =	"c20800000000n",
-  aih_2 =	"cc0800000000n",
-  al_2 =	"00005e000000j",
-  alr_2 =	"000000001e00g",
-  aly_2 =	"e3000000005el",
-  alg_2 =	"e3000000000al",
-  algr_2 =	"0000b90a0000h",
-  algf_2 =	"e3000000001al",
-  algfr_2 =	"0000b91a0000h",
-  alfi_2 =	"c20b00000000n",
-  algfi_2 =	"c20a00000000n",
-  alc_2 =	"e30000000098l",
-  alcr_2 =	"0000b9980000h",
-  alcg_2 =	"e30000000088l",
-  alcgr_2 =	"0000b9880000h",
-  alsih_2 =	"cc0a00000000n",
-  alsihn_2 =	"cc0b00000000n",
-  axr_2 =	"000000003600g",
-  ad_2 =	"00006a000000j",
-  adr_2 =	"000000002a00g",
-  ae_2 =	"00007a000000j",
-  aer_2 =	"000000003a00g",
-  aw_2 =	"00006e000000j",
-  awr_2 =	"000000002e00g",
-  au_2 =	"00007e000000j",
-  aur_2 =	"000000003e00g",
-  n_2 =		"000054000000j",
-  nr_2 =	"000000001400g",
-  ny_2 =	"e30000000054l",
-  ng_2 =	"e30000000080l",
-  ngr_2 =	"0000b9800000h",
-  nihf_2 =	"c00a00000000n",
-  nihh_2 =	"0000a5040000i",
-  nihl_2 =	"0000a5050000i",
-  nilf_2 =	"c00b00000000n",
-  nilh_2 =	"0000a5060000i",
-  nill_2 =	"0000a5070000i",
-  bal_2 =	"000045000000j",
-  balr_2 =	"000000000500g",
-  bas_2 =	"00004d000000j",
-  basr_2 =	"000000000d00g",
-  bassm_2 =	"000000000c00g",
-  bsa_2 =	"0000b25a0000h",
-  bsm_2 =	"000000000b00g",
-  bakr_2 =	"0000b2400000h",
-  bsg_2 =	"0000b2580000h",
-  bc_2 =	"000047000000k",
-  bcr_2 =	"000000000700g",
-  bct_2 =	"000046000000j",
-  bctr_2 =	"000000000600g",
-  bctg_2 =	"e30000000046l",
-  bctgr_2 =	"0000b9460000h",
-  bxh_3 =	"000086000000q",
-  bxhg_3 =	"eb0000000044s",
-  bxle_3 =	"000087000000q",
-  bxleg_3 =	"eb0000000045s",
-  brasl_2 =	"c00500000000o",
-  brcl_2 =	"c00400000000p",
-  brcth_2 =	"cc0600000000o",
-  cksm_2 =	"0000b2410000h",
-  km_2 =	"0000b92e0000h",
-  kmf_2 =	"0000b92a0000h",
-  kmc_2 =	"0000b92f0000h",
-  kmo_2 =	"0000b92b0000h",
-  c_2 =		"000059000000j",
-  cr_2 =	"000000001900g",
-  cy_2 =	"e30000000059l",
-  cg_2 =	"e30000000020l",
-  cgr_2 =	"0000b9200000h",
-  cgf_2 =	"e30000000030l",
-  cgfr_2 =	"0000b9300000h",
-  cxbr_2 =	"0000b3490000h",
-  cxtr_2 =	"0000b3ec0000h",
-  cxr_2 =	"0000b3690000h",
-  cdbr_2 =	"0000b3190000h",
-  cdtr_2 =	"0000b3e40000h",
-  cd_2 =	"000069000000j",
-  cdr_2 =	"000000002900g",
-  cebr_2 =	"0000b3090000h",
-  ce_2 =	"000079000000j",
-  cer_2 =	"000000003900g",
-  kxbr_2 =	"0000b3480000h",
-  kxtr_2 =	"0000b3e80000h",
-  kdbr_2 =	"0000b3180000h",
-  kdtr_2 =	"0000b3e00000h",
-  kebr_2 =	"0000b3080000h",
-  cs_3 =	"0000ba000000q",
-  csy_3 =	"eb0000000014s",
-  csg_3 =	"eb0000000030s",
-  csp_2 =	"0000b2500000h",
-  cspg_2 =	"0000b98a0000h",
-  cextr_2 =	"0000b3fc0000h",
-  cedtr_2 =	"0000b3f40000h",
-  cds_3 =	"0000bb000000q",
-  cdsy_3 =	"eb0000000031s",
-  cdsg_3 =	"eb000000003es",
-  ch_2 =	"000049000000j",
-  chy_2 =	"e30000000079l",
-  cgh_2 =	"e30000000034l",
-  chrl_2 =	"c60500000000o",
-  cghrl_2 =	"c60400000000o",
-  chf_2 =	"e300000000cdl",
-  chhr_2 =	"0000b9cd0000h",
-  chlr_2 =	"0000b9dd0000h",
-  cfi_2 =	"c20d00000000n",
-  cgfi_2 =	"c20c00000000n",
-  cih_2 =	"cc0d00000000n",
-  cl_2 =	"000055000000j",
-  clr_2 =	"000000001500g",
-  cly_2 =	"e30000000055l",
-  clg_2 =	"e30000000021l",
-  clgr_2 =	"0000b9210000h",
-  clgf_2 =	"e30000000031l",
-  clgfr_2 =	"0000b9310000h",
-  clmh_3 =	"eb0000000020t",
-  clm_3 =	"0000bd000000r",
-  clmy_3 =	"eb0000000021t",
-  clhf_2 =	"e300000000cfl",
-  clhhr_2 =	"0000b9cf0000h",
-  clhlr_2 =	"0000b9df0000h",
-  clfi_2 =	"c20f00000000n",
-  clgfi_2 =	"c20e00000000n",
-  clih_2 =	"cc0f00000000n",
-  clcl_2 =	"000000000f00g",
-  clcle_3 =	"0000a9000000q",
-  clclu_3 =	"eb000000008fs",
-  clrl_2 =	"c60f00000000o",
-  clhrl_2 =	"c60700000000o",
-  clgrl_2 =	"c60a00000000o",
-  clghrl_2 =	"c60600000000o",
-  clgfrl_2 =	"c60e00000000o",
-  clst_2 =	"0000b25d0000h",
-  crl_2 =	"c60d00000000o",
-  cgrl_2 =	"c60800000000o",
-  cgfrl_2 =	"c60c00000000o",
-  cuse_2 =	"0000b2570000h",
-  cmpsc_2 =	"0000b2630000h",
-  kimd_2 =	"0000b93e0000h",
-  klmd_2 =	"0000b93f0000h",
-  kmac_2 =	"0000b91e0000h",
-  thdr_2 =	"0000b3590000h",
-  thder_2 =	"0000b3580000h",
-  cxfbr_2 =	"0000b3960000h",
-  cxftr_2 =	"0000b9590000h",
-  cxfr_2 =	"0000b3b60000h",
-  cdfbr_2 =	"0000b3950000h",
-  cdftr_2 =	"0000b9510000h",
-  cdfr_2 =	"0000b3b50000h",
-  cefbr_2 =	"0000b3940000h",
-  cefr_2 =	"0000b3b40000h",
-  cxgbr_2 =	"0000b3a60000h",
-  cxgtr_2 =	"0000b3f90000h",
-  cxgr_2 =	"0000b3c60000h",
-  cdgbr_2 =	"0000b3a50000h",
-  cdgtr_2 =	"0000b3f10000h",
-  cdgr_2 =	"0000b3c50000h",
-  cegbr_2 =	"0000b3a40000h",
-  cegr_2 =	"0000b3c40000h",
-  cxstr_2 =	"0000b3fb0000h",
-  cdstr_2 =	"0000b3f30000h",
-  cxutr_2 =	"0000b3fa0000h",
-  cdutr_2 =	"0000b3f20000h",
-  cvb_2 =	"00004f000000j",
-  cvby_2 =	"e30000000006l",
-  cvbg_2 =	"e3000000000el",
-  cvd_2 =	"00004e000000j",
-  cvdy_2 =	"e30000000026l",
-  cvdg_2 =	"e3000000002el",
-  cuxtr_2 =	"0000b3ea0000h",
-  cudtr_2 =	"0000b3e20000h",
-  cu42_2 =	"0000b9b30000h",
-  cu41_2 =	"0000b9b20000h",
-  cpya_2 =	"0000b24d0000h",
-  d_2 =		"00005d000000j",
-  dr_2 =	"000000001d00g",
-  dxbr_2 =	"0000b34d0000h",
-  dxr_2 =	"0000b22d0000h",
-  ddbr_2 =	"0000b31d0000h",
-  dd_2 =	"00006d000000j",
-  ddr_2 =	"000000002d00g",
-  debr_2 =	"0000b30d0000h",
-  de_2 =	"00007d000000j",
-  der_2 =	"000000003d00g",
-  dl_2 =	"e30000000097l",
-  dlr_2 =	"0000b9970000h",
-  dlg_2 =	"e30000000087l",
-  dlgr_2 =	"0000b9870000h",
-  dsg_2 =	"e3000000000dl",
-  dsgr_2 =	"0000b90d0000h",
-  dsgf_2 =	"e3000000001dl",
-  dsgfr_2 =	"0000b91d0000h",
-  x_2 =		"000057000000j",
-  xr_2 =	"000000001700g",
-  xy_2 =	"e30000000057l",
-  xg_2 =	"e30000000082l",
-  xgr_2 =	"0000b9820000h",
-  xihf_2 =	"c00600000000n",
-  xilf_2 =	"c00700000000n",
-  ex_2 =	"000044000000j",
-  exrl_2 =	"c60000000000o",
-  ear_2 =	"0000b24f0000h",
-  esea_2 =	"0000b99d0000h",
-  eextr_2 =	"0000b3ed0000h",
-  eedtr_2 =	"0000b3e50000h",
-  ecag_3 =	"eb000000004cs",
-  efpc_2 =	"0000b38c0000h",
-  epar_2 =	"0000b2260000h",
-  epair_2 =	"0000b99a0000h",
-  epsw_2 =	"0000b98d0000h",
-  esar_2 =	"0000b2270000h",
-  esair_2 =	"0000b99b0000h",
-  esxtr_2 =	"0000b3ef0000h",
-  esdtr_2 =	"0000b3e70000h",
-  ereg_2 =	"0000b2490000h",
-  eregg_2 =	"0000b90e0000h",
-  esta_2 =	"0000b24a0000h",
-  flogr_2 =	"0000b9830000h",
-  hdr_2 =	"000000002400g",
-  her_2 =	"000000003400g",
-  iac_2 =	"0000b2240000h",
-  ic_2 =	"000043000000j",
-  icy_2 =	"e30000000073l",
-  icmh_3 =	"eb0000000080t",
-  icm_3 =	"0000bf000000r",
-  icmy_3 =	"eb0000000081t",
-  iihf_2 =	"c00800000000n",
-  iihh_2 =	"0000a5000000i",
-  iihl_2 =	"0000a5010000i",
-  iilf_2 =	"c00900000000n",
-  iilh_2 =	"0000a5020000i",
-  iill_2 =	"0000a5030000i",
-  ipm_2 =	"0000b2220000h",
-  iske_2 =	"0000b2290000h",
-  ivsk_2 =	"0000b2230000h",
-  l_2 =		"000058000000j",
-  lr_2 =	"000000001800g",
-  ly_2 =	"e30000000058l",
-  lg_2 =	"e30000000004l",
-  lgr_2 =	"0000b9040000h",
-  lgf_2 =	"e30000000014l",
-  lgfr_2 =	"0000b9140000h",
-  lghi_2 =	"0000a7090000i",
-  lxr_2 =	"0000b3650000h",
-  ld_2 =	"000068000000j",
-  ldr_2 =	"000000002800g",
-  ldy_2 =	"ed0000000065l",
-  le_2 =	"000078000000j",
-  ler_2 =	"000000003800g",
-  ley_2 =	"ed0000000064l",
-  lam_3 =	"00009a000000q",
-  lamy_3 =	"eb000000009as",
-  la_2 =	"000041000000j",
-  lay_2 =	"e30000000071l",
-  lae_2 =	"000051000000j",
-  laey_2 =	"e30000000075l",
-  larl_2 =	"c00000000000o",
-  laa_3 =	"eb00000000f8s",
-  laag_3 =	"eb00000000e8s",
-  laal_3 =	"eb00000000fas",
-  laalg_3 =	"eb00000000eas",
-  lan_3 =	"eb00000000f4s",
-  lang_3 =	"eb00000000e4s",
-  lax_3 =	"eb00000000f7s",
-  laxg_3 =	"eb00000000e7s",
-  lao_3 =	"eb00000000f6s",
-  laog_3 =	"eb00000000e6s",
-  lt_2 =	"e30000000012l",
-  ltr_2 =	"000000001200g",
-  ltg_2 =	"e30000000002l",
-  ltgr_2 =	"0000b9020000h",
-  ltgf_2 =	"e30000000032l",
-  ltgfr_2 =	"0000b9120000h",
-  ltxbr_2 =	"0000b3420000h",
-  ltxtr_2 =	"0000b3de0000h",
-  ltxr_2 =	"0000b3620000h",
-  ltdbr_2 =	"0000b3120000h",
-  ltdtr_2 =	"0000b3d60000h",
-  ltdr_2 =	"000000002200g",
-  ltebr_2 =	"0000b3020000h",
-  lter_2 =	"000000003200g",
-  lb_2 =	"e30000000076l",
-  lbr_2 =	"0000b9260000h",
-  lgb_2 =	"e30000000077l",
-  lgbr_2 =	"0000b9060000h",
-  lbh_2 =	"e300000000c0l",
-  lcr_2 =	"000000001300g",
-  lcgr_2 =	"0000b9030000h",
-  lcgfr_2 =	"0000b9130000h",
-  lcxbr_2 =	"0000b3430000h",
-  lcxr_2 =	"0000b3630000h",
-  lcdbr_2 =	"0000b3130000h",
-  lcdr_2 =	"000000002300g",
-  lcdfr_2 =	"0000b3730000h",
-  lcebr_2 =	"0000b3030000h",
-  lcer_2 =	"000000003300g",
-  lctl_3 =	"0000b7000000q",
-  lctlg_3 =	"eb000000002fs",
-  fixr_2 =	"0000b3670000h",
-  fidr_2 =	"0000b37f0000h",
-  fier_2 =	"0000b3770000h",
-  ldgr_2 =	"0000b3c10000h",
-  lgdr_2 =	"0000b3cd0000h",
-  lh_2 =	"000048000000j",
-  lhr_2 =	"0000b9270000h",
-  lhy_2 =	"e30000000078l",
-  lgh_2 =	"e30000000015l",
-  lghr_2 =	"0000b9070000h",
-  lhh_2 =	"e300000000c4l",
-  lhi_2 =	"0000a7080000i",
-  lhrl_2 =	"c40500000000o",
-  lghrl_2 =	"c40400000000o",
-  lfh_2 =	"e300000000cal",
-  lgfi_2 =	"c00100000000n",
-  lxdbr_2 =	"0000b3050000h",
-  lxdr_2 =	"0000b3250000h",
-  lxebr_2 =	"0000b3060000h",
-  lxer_2 =	"0000b3260000h",
-  ldebr_2 =	"0000b3040000h",
-  lder_2 =	"0000b3240000h",
-  llgf_2 =	"e30000000016l",
-  llgfr_2 =	"0000b9160000h",
-  llc_2 =	"e30000000094l",
-  llcr_2 =	"0000b9940000h",
-  llgc_2 =	"e30000000090l",
-  llgcr_2 =	"0000b9840000h",
-  llch_2 =	"e300000000c2l",
-  llh_2 =	"e30000000095l",
-  llhr_2 =	"0000b9950000h",
-  llgh_2 =	"e30000000091l",
-  llghr_2 =	"0000b9850000h",
-  llhh_2 =	"e300000000c6l",
-  llhrl_2 =	"c40200000000o",
-  llghrl_2 =	"c40600000000o",
-  llihf_2 =	"c00e00000000n",
-  llihh_2 =	"0000a50c0000i",
-  llihl_2 =	"0000a50d0000i",
-  llilf_2 =	"c00f00000000n",
-  llilh_2 =	"0000a50e0000i",
-  llill_2 =	"0000a50f0000i",
-  llgfrl_2 =	"c40e00000000o",
-  llgt_2 =	"e30000000017l",
-  llgtr_2 =	"0000b9170000h",
-  lm_3 =	"000098000000q",
-  lmy_3 =	"eb0000000098s",
-  lmg_3 =	"eb0000000004s",
-  lmh_3 =	"eb0000000096s",
-  lnr_2 =	"000000001100g",
-  lngr_2 =	"0000b9010000h",
-  lngfr_2 =	"0000b9110000h",
-  lnxbr_2 =	"0000b3410000h",
-  lnxr_2 =	"0000b3610000h",
-  lndbr_2 =	"0000b3110000h",
-  lndr_2 =	"000000002100g",
-  lndfr_2 =	"0000b3710000h",
-  lnebr_2 =	"0000b3010000h",
-  lner_2 =	"000000003100g",
-  loc_3 =	"eb00000000f2t",
-  locg_3 =	"eb00000000e2t",
-  lpq_2 =	"e3000000008fl",
-  lpr_2 =	"000000001000g",
-  lpgr_2 =	"0000b9000000h",
-  lpgfr_2 =	"0000b9100000h",
-  lpxbr_2 =	"0000b3400000h",
-  lpxr_2 =	"0000b3600000h",
-  lpdbr_2 =	"0000b3100000h",
-  lpdr_2 =	"000000002000g",
-  lpdfr_2 =	"0000b3700000h",
-  lpebr_2 =	"0000b3000000h",
-  lper_2 =	"000000003000g",
-  lra_2 =	"0000b1000000j",
-  lray_2 =	"e30000000013l",
-  lrag_2 =	"e30000000003l",
-  lrl_2 =	"c40d00000000o",
-  lgrl_2 =	"c40800000000o",
-  lgfrl_2 =	"c40c00000000o",
-  lrvh_2 =	"e3000000001fl",
-  lrv_2 =	"e3000000001el",
-  lrvr_2 =	"0000b91f0000h",
-  lrvg_2 =	"e3000000000fl",
-  lrvgr_2 =	"0000b90f0000h",
-  ldxbr_2 =	"0000b3450000h",
-  ldxr_2 =	"000000002500g",
-  lrdr_2 =	"000000002500g",
-  lexbr_2 =	"0000b3460000h",
-  lexr_2 =	"0000b3660000h",
-  ledbr_2 =	"0000b3440000h",
-  ledr_2 =	"000000003500g",
-  lrer_2 =	"000000003500g",
-  lura_2 =	"0000b24b0000h",
-  lurag_2 =	"0000b9050000h",
-  lzxr_2 =	"0000b3760000h",
-  lzdr_2 =	"0000b3750000h",
-  lzer_2 =	"0000b3740000h",
-  msta_2 =	"0000b2470000h",
-  mvcl_2 =	"000000000e00g",
-  mvcle_3 =	"0000a8000000q",
-  mvclu_3 =	"eb000000008es",
-  mvpg_2 =	"0000b2540000h",
-  mvst_2 =	"0000b2550000h",
-  m_2 =		"00005c000000j",
-  mfy_2 =	"e3000000005cl",
-  mr_2 =	"000000001c00g",
-  mxbr_2 =	"0000b34c0000h",
-  mxr_2 =	"000000002600g",
-  mdbr_2 =	"0000b31c0000h",
-  md_2 =	"00006c000000j",
-  mdr_2 =	"000000002c00g",
-  mxdbr_2 =	"0000b3070000h",
-  mxd_2 =	"000067000000j",
-  mxdr_2 =	"000000002700g",
-  meebr_2 =	"0000b3170000h",
-  meer_2 =	"0000b3370000h",
-  mdebr_2 =	"0000b30c0000h",
-  mde_2 =	"00007c000000j",
-  mder_2 =	"000000003c00g",
-  me_2 =	"00007c000000j",
-  mer_2 =	"000000003c00g",
-  mh_2 =	"00004c000000j",
-  mhy_2 =	"e3000000007cl",
-  mlg_2 =	"e30000000086l",
-  mlgr_2 =	"0000b9860000h",
-  ml_2 =	"e30000000096l",
-  mlr_2 =	"0000b9960000h",
-  ms_2 =	"000071000000j",
-  msr_2 =	"0000b2520000h",
-  msy_2 =	"e30000000051l",
-  msg_2 =	"e3000000000cl",
-  msgr_2 =	"0000b90c0000h",
-  msgf_2 =	"e3000000001cl",
-  msgfr_2 =	"0000b91c0000h",
-  msfi_2 =	"c20100000000n",
-  msgfi_2 =	"c20000000000n",
-  maer_3 =	"0000b32e0000r",
+  a_2 =		"00005a000000RX-a",
+  ar_2 =	"000000001a00RR",
+  ay_2 =	"e3000000005aRXY-a",
+  ag_2 =	"e30000000008RXY-a",
+  agr_2 =	"0000b9080000RRE",
+  agf_2 =	"e30000000018RXY-a",
+  agfr_2 =	"0000b9180000RRE",
+  axbr_2 =	"0000b34a0000RRE",
+  adbr_2 =	"0000b31a0000RRE",
+  aebr_2 =	"0000b30a0000RRE",
+  aghi_2 =	"0000a70b0000RI-a",
+  ah_2 =	"00004a000000RX-a",
+  ahi_2 =	"0000a70a0000RI-a",
+  ahy_2 =	"e3000000007aRXY-a",
+  afi_2 =	"c20900000000RIL-a",
+  agfi_2 =	"c20800000000RIL-a",
+  aih_2 =	"cc0800000000RIL-a",
+  al_2 =	"00005e000000RX-a",
+  alr_2 =	"000000001e00RR",
+  aly_2 =	"e3000000005eRXY-a",
+  alg_2 =	"e3000000000aRXY-a",
+  algr_2 =	"0000b90a0000RRE",
+  algf_2 =	"e3000000001aRXY-a",
+  algfr_2 =	"0000b91a0000RRE",
+  alfi_2 =	"c20b00000000RIL-a",
+  algfi_2 =	"c20a00000000RIL-a",
+  alc_2 =	"e30000000098RXY-a",
+  alcr_2 =	"0000b9980000RRE",
+  alcg_2 =	"e30000000088RXY-a",
+  alcgr_2 =	"0000b9880000RRE",
+  alsih_2 =	"cc0a00000000RIL-a",
+  alsihn_2 =	"cc0b00000000RIL-a",
+  axr_2 =	"000000003600RR",
+  ad_2 =	"00006a000000RX-a",
+  adr_2 =	"000000002a00RR",
+  ae_2 =	"00007a000000RX-a",
+  aer_2 =	"000000003a00RR",
+  aw_2 =	"00006e000000RX-a",
+  awr_2 =	"000000002e00RR",
+  au_2 =	"00007e000000RX-a",
+  aur_2 =	"000000003e00RR",
+  n_2 =		"000054000000RX-a",
+  nr_2 =	"000000001400RR",
+  ny_2 =	"e30000000054RXY-a",
+  ng_2 =	"e30000000080RXY-a",
+  ngr_2 =	"0000b9800000RRE",
+  nihf_2 =	"c00a00000000RIL-a",
+  nihh_2 =	"0000a5040000RI-a",
+  nihl_2 =	"0000a5050000RI-a",
+  nilf_2 =	"c00b00000000RIL-a",
+  nilh_2 =	"0000a5060000RI-a",
+  nill_2 =	"0000a5070000RI-a",
+  bal_2 =	"000045000000RX-a",
+  balr_2 =	"000000000500RR",
+  bas_2 =	"00004d000000RX-a",
+  basr_2 =	"000000000d00RR",
+  bassm_2 =	"000000000c00RR",
+  bsa_2 =	"0000b25a0000RRE",
+  bsm_2 =	"000000000b00RR",
+  bakr_2 =	"0000b2400000RRE",
+  bsg_2 =	"0000b2580000RRE",
+  bc_2 =	"000047000000RX-b",
+  bcr_2 =	"000000000700RR",
+  bct_2 =	"000046000000RX-a",
+  bctr_2 =	"000000000600RR",
+  bctg_2 =	"e30000000046RXY-a",
+  bctgr_2 =	"0000b9460000RRE",
+  bxh_3 =	"000086000000RS-a",
+  bxhg_3 =	"eb0000000044RSY-a",
+  bxle_3 =	"000087000000RS-a",
+  bxleg_3 =	"eb0000000045RSY-a",
+  brasl_2 =	"c00500000000RIL-b",
+  brcl_2 =	"c00400000000RIL-c",
+  brcth_2 =	"cc0600000000RIL-b",
+  cksm_2 =	"0000b2410000RRE",
+  km_2 =	"0000b92e0000RRE",
+  kmf_2 =	"0000b92a0000RRE",
+  kmc_2 =	"0000b92f0000RRE",
+  kmo_2 =	"0000b92b0000RRE",
+  c_2 =		"000059000000RX-a",
+  cr_2 =	"000000001900RR",
+  cy_2 =	"e30000000059RXY-a",
+  cg_2 =	"e30000000020RXY-a",
+  cgr_2 =	"0000b9200000RRE",
+  cgf_2 =	"e30000000030RXY-a",
+  cgfr_2 =	"0000b9300000RRE",
+  cxbr_2 =	"0000b3490000RRE",
+  cxtr_2 =	"0000b3ec0000RRE",
+  cxr_2 =	"0000b3690000RRE",
+  cdbr_2 =	"0000b3190000RRE",
+  cdtr_2 =	"0000b3e40000RRE",
+  cd_2 =	"000069000000RX-a",
+  cdr_2 =	"000000002900RR",
+  cebr_2 =	"0000b3090000RRE",
+  ce_2 =	"000079000000RX-a",
+  cer_2 =	"000000003900RR",
+  kxbr_2 =	"0000b3480000RRE",
+  kxtr_2 =	"0000b3e80000RRE",
+  kdbr_2 =	"0000b3180000RRE",
+  kdtr_2 =	"0000b3e00000RRE",
+  kebr_2 =	"0000b3080000RRE",
+  cs_3 =	"0000ba000000RS-a",
+  csy_3 =	"eb0000000014RSY-a",
+  csg_3 =	"eb0000000030RSY-a",
+  csp_2 =	"0000b2500000RRE",
+  cspg_2 =	"0000b98a0000RRE",
+  cextr_2 =	"0000b3fc0000RRE",
+  cedtr_2 =	"0000b3f40000RRE",
+  cds_3 =	"0000bb000000RS-a",
+  cdsy_3 =	"eb0000000031RSY-a",
+  cdsg_3 =	"eb000000003eRSY-a",
+  ch_2 =	"000049000000RX-a",
+  chy_2 =	"e30000000079RXY-a",
+  cgh_2 =	"e30000000034RXY-a",
+  chrl_2 =	"c60500000000RIL-b",
+  cghrl_2 =	"c60400000000RIL-b",
+  chf_2 =	"e300000000cdRXY-a",
+  chhr_2 =	"0000b9cd0000RRE",
+  chlr_2 =	"0000b9dd0000RRE",
+  cfi_2 =	"c20d00000000RIL-a",
+  cgfi_2 =	"c20c00000000RIL-a",
+  cih_2 =	"cc0d00000000RIL-a",
+  cl_2 =	"000055000000RX-a",
+  clr_2 =	"000000001500RR",
+  cly_2 =	"e30000000055RXY-a",
+  clg_2 =	"e30000000021RXY-a",
+  clgr_2 =	"0000b9210000RRE",
+  clgf_2 =	"e30000000031RXY-a",
+  clgfr_2 =	"0000b9310000RRE",
+  clmh_3 =	"eb0000000020RSY-b",
+  clm_3 =	"0000bd000000RS-b",
+  clmy_3 =	"eb0000000021RSY-b",
+  clhf_2 =	"e300000000cfRXY-a",
+  clhhr_2 =	"0000b9cf0000RRE",
+  clhlr_2 =	"0000b9df0000RRE",
+  clfi_2 =	"c20f00000000RIL-a",
+  clgfi_2 =	"c20e00000000RIL-a",
+  clih_2 =	"cc0f00000000RIL-a",
+  clcl_2 =	"000000000f00RR",
+  clcle_3 =	"0000a9000000RS-a",
+  clclu_3 =	"eb000000008fRSY-a",
+  clrl_2 =	"c60f00000000RIL-b",
+  clhrl_2 =	"c60700000000RIL-b",
+  clgrl_2 =	"c60a00000000RIL-b",
+  clghrl_2 =	"c60600000000RIL-b",
+  clgfrl_2 =	"c60e00000000RIL-b",
+  clst_2 =	"0000b25d0000RRE",
+  crl_2 =	"c60d00000000RIL-b",
+  cgrl_2 =	"c60800000000RIL-b",
+  cgfrl_2 =	"c60c00000000RIL-b",
+  cuse_2 =	"0000b2570000RRE",
+  cmpsc_2 =	"0000b2630000RRE",
+  kimd_2 =	"0000b93e0000RRE",
+  klmd_2 =	"0000b93f0000RRE",
+  kmac_2 =	"0000b91e0000RRE",
+  thdr_2 =	"0000b3590000RRE",
+  thder_2 =	"0000b3580000RRE",
+  cxfbr_2 =	"0000b3960000RRE",
+  cxftr_2 =	"0000b9590000RRE",
+  cxfr_2 =	"0000b3b60000RRE",
+  cdfbr_2 =	"0000b3950000RRE",
+  cdftr_2 =	"0000b9510000RRE",
+  cdfr_2 =	"0000b3b50000RRE",
+  cefbr_2 =	"0000b3940000RRE",
+  cefr_2 =	"0000b3b40000RRE",
+  cxgbr_2 =	"0000b3a60000RRE",
+  cxgtr_2 =	"0000b3f90000RRE",
+  cxgr_2 =	"0000b3c60000RRE",
+  cdgbr_2 =	"0000b3a50000RRE",
+  cdgtr_2 =	"0000b3f10000RRE",
+  cdgr_2 =	"0000b3c50000RRE",
+  cegbr_2 =	"0000b3a40000RRE",
+  cegr_2 =	"0000b3c40000RRE",
+  cxstr_2 =	"0000b3fb0000RRE",
+  cdstr_2 =	"0000b3f30000RRE",
+  cxutr_2 =	"0000b3fa0000RRE",
+  cdutr_2 =	"0000b3f20000RRE",
+  cvb_2 =	"00004f000000RX-a",
+  cvby_2 =	"e30000000006RXY-a",
+  cvbg_2 =	"e3000000000eRXY-a",
+  cvd_2 =	"00004e000000RX-a",
+  cvdy_2 =	"e30000000026RXY-a",
+  cvdg_2 =	"e3000000002eRXY-a",
+  cuxtr_2 =	"0000b3ea0000RRE",
+  cudtr_2 =	"0000b3e20000RRE",
+  cu42_2 =	"0000b9b30000RRE",
+  cu41_2 =	"0000b9b20000RRE",
+  cpya_2 =	"0000b24d0000RRE",
+  d_2 =		"00005d000000RX-a",
+  dr_2 =	"000000001d00RR",
+  dxbr_2 =	"0000b34d0000RRE",
+  dxr_2 =	"0000b22d0000RRE",
+  ddbr_2 =	"0000b31d0000RRE",
+  dd_2 =	"00006d000000RX-a",
+  ddr_2 =	"000000002d00RR",
+  debr_2 =	"0000b30d0000RRE",
+  de_2 =	"00007d000000RX-a",
+  der_2 =	"000000003d00RR",
+  dl_2 =	"e30000000097RXY-a",
+  dlr_2 =	"0000b9970000RRE",
+  dlg_2 =	"e30000000087RXY-a",
+  dlgr_2 =	"0000b9870000RRE",
+  dsg_2 =	"e3000000000dRXY-a",
+  dsgr_2 =	"0000b90d0000RRE",
+  dsgf_2 =	"e3000000001dRXY-a",
+  dsgfr_2 =	"0000b91d0000RRE",
+  x_2 =		"000057000000RX-a",
+  xr_2 =	"000000001700RR",
+  xy_2 =	"e30000000057RXY-a",
+  xg_2 =	"e30000000082RXY-a",
+  xgr_2 =	"0000b9820000RRE",
+  xihf_2 =	"c00600000000RIL-a",
+  xilf_2 =	"c00700000000RIL-a",
+  ex_2 =	"000044000000RX-a",
+  exrl_2 =	"c60000000000RIL-b",
+  ear_2 =	"0000b24f0000RRE",
+  esea_2 =	"0000b99d0000RRE",
+  eextr_2 =	"0000b3ed0000RRE",
+  eedtr_2 =	"0000b3e50000RRE",
+  ecag_3 =	"eb000000004cRSY-a",
+  efpc_2 =	"0000b38c0000RRE",
+  epar_2 =	"0000b2260000RRE",
+  epair_2 =	"0000b99a0000RRE",
+  epsw_2 =	"0000b98d0000RRE",
+  esar_2 =	"0000b2270000RRE",
+  esair_2 =	"0000b99b0000RRE",
+  esxtr_2 =	"0000b3ef0000RRE",
+  esdtr_2 =	"0000b3e70000RRE",
+  ereg_2 =	"0000b2490000RRE",
+  eregg_2 =	"0000b90e0000RRE",
+  esta_2 =	"0000b24a0000RRE",
+  flogr_2 =	"0000b9830000RRE",
+  hdr_2 =	"000000002400RR",
+  her_2 =	"000000003400RR",
+  iac_2 =	"0000b2240000RRE",
+  ic_2 =	"000043000000RX-a",
+  icy_2 =	"e30000000073RXY-a",
+  icmh_3 =	"eb0000000080RSY-b",
+  icm_3 =	"0000bf000000RS-b",
+  icmy_3 =	"eb0000000081RSY-b",
+  iihf_2 =	"c00800000000RIL-a",
+  iihh_2 =	"0000a5000000RI-a",
+  iihl_2 =	"0000a5010000RI-a",
+  iilf_2 =	"c00900000000RIL-a",
+  iilh_2 =	"0000a5020000RI-a",
+  iill_2 =	"0000a5030000RI-a",
+  ipm_2 =	"0000b2220000RRE",
+  iske_2 =	"0000b2290000RRE",
+  ivsk_2 =	"0000b2230000RRE",
+  l_2 =		"000058000000RX-a",
+  lr_2 =	"000000001800RR",
+  ly_2 =	"e30000000058RXY-a",
+  lg_2 =	"e30000000004RXY-a",
+  lgr_2 =	"0000b9040000RRE",
+  lgf_2 =	"e30000000014RXY-a",
+  lgfr_2 =	"0000b9140000RRE",
+  lghi_2 =	"0000a7090000RI-a",
+  lxr_2 =	"0000b3650000RRE",
+  ld_2 =	"000068000000RX-a",
+  ldr_2 =	"000000002800RR",
+  ldy_2 =	"ed0000000065RXY-a",
+  le_2 =	"000078000000RX-a",
+  ler_2 =	"000000003800RR",
+  ley_2 =	"ed0000000064RXY-a",
+  lam_3 =	"00009a000000RS-a",
+  lamy_3 =	"eb000000009aRSY-a",
+  la_2 =	"000041000000RX-a",
+  lay_2 =	"e30000000071RXY-a",
+  lae_2 =	"000051000000RX-a",
+  laey_2 =	"e30000000075RXY-a",
+  larl_2 =	"c00000000000RIL-b",
+  laa_3 =	"eb00000000f8RSY-a",
+  laag_3 =	"eb00000000e8RSY-a",
+  laal_3 =	"eb00000000faRSY-a",
+  laalg_3 =	"eb00000000eaRSY-a",
+  lan_3 =	"eb00000000f4RSY-a",
+  lang_3 =	"eb00000000e4RSY-a",
+  lax_3 =	"eb00000000f7RSY-a",
+  laxg_3 =	"eb00000000e7RSY-a",
+  lao_3 =	"eb00000000f6RSY-a",
+  laog_3 =	"eb00000000e6RSY-a",
+  lt_2 =	"e30000000012RXY-a",
+  ltr_2 =	"000000001200RR",
+  ltg_2 =	"e30000000002RXY-a",
+  ltgr_2 =	"0000b9020000RRE",
+  ltgf_2 =	"e30000000032RXY-a",
+  ltgfr_2 =	"0000b9120000RRE",
+  ltxbr_2 =	"0000b3420000RRE",
+  ltxtr_2 =	"0000b3de0000RRE",
+  ltxr_2 =	"0000b3620000RRE",
+  ltdbr_2 =	"0000b3120000RRE",
+  ltdtr_2 =	"0000b3d60000RRE",
+  ltdr_2 =	"000000002200RR",
+  ltebr_2 =	"0000b3020000RRE",
+  lter_2 =	"000000003200RR",
+  lb_2 =	"e30000000076RXY-a",
+  lbr_2 =	"0000b9260000RRE",
+  lgb_2 =	"e30000000077RXY-a",
+  lgbr_2 =	"0000b9060000RRE",
+  lbh_2 =	"e300000000c0RXY-a",
+  lcr_2 =	"000000001300RR",
+  lcgr_2 =	"0000b9030000RRE",
+  lcgfr_2 =	"0000b9130000RRE",
+  lcxbr_2 =	"0000b3430000RRE",
+  lcxr_2 =	"0000b3630000RRE",
+  lcdbr_2 =	"0000b3130000RRE",
+  lcdr_2 =	"000000002300RR",
+  lcdfr_2 =	"0000b3730000RRE",
+  lcebr_2 =	"0000b3030000RRE",
+  lcer_2 =	"000000003300RR",
+  lctl_3 =	"0000b7000000RS-a",
+  lctlg_3 =	"eb000000002fRSY-a",
+  fixr_2 =	"0000b3670000RRE",
+  fidr_2 =	"0000b37f0000RRE",
+  fier_2 =	"0000b3770000RRE",
+  ldgr_2 =	"0000b3c10000RRE",
+  lgdr_2 =	"0000b3cd0000RRE",
+  lh_2 =	"000048000000RX-a",
+  lhr_2 =	"0000b9270000RRE",
+  lhy_2 =	"e30000000078RXY-a",
+  lgh_2 =	"e30000000015RXY-a",
+  lghr_2 =	"0000b9070000RRE",
+  lhh_2 =	"e300000000c4RXY-a",
+  lhi_2 =	"0000a7080000RI-a",
+  lhrl_2 =	"c40500000000RIL-b",
+  lghrl_2 =	"c40400000000RIL-b",
+  lfh_2 =	"e300000000caRXY-a",
+  lgfi_2 =	"c00100000000RIL-a",
+  lxdbr_2 =	"0000b3050000RRE",
+  lxdr_2 =	"0000b3250000RRE",
+  lxebr_2 =	"0000b3060000RRE",
+  lxer_2 =	"0000b3260000RRE",
+  ldebr_2 =	"0000b3040000RRE",
+  lder_2 =	"0000b3240000RRE",
+  llgf_2 =	"e30000000016RXY-a",
+  llgfr_2 =	"0000b9160000RRE",
+  llc_2 =	"e30000000094RXY-a",
+  llcr_2 =	"0000b9940000RRE",
+  llgc_2 =	"e30000000090RXY-a",
+  llgcr_2 =	"0000b9840000RRE",
+  llch_2 =	"e300000000c2RXY-a",
+  llh_2 =	"e30000000095RXY-a",
+  llhr_2 =	"0000b9950000RRE",
+  llgh_2 =	"e30000000091RXY-a",
+  llghr_2 =	"0000b9850000RRE",
+  llhh_2 =	"e300000000c6RXY-a",
+  llhrl_2 =	"c40200000000RIL-b",
+  llghrl_2 =	"c40600000000RIL-b",
+  llihf_2 =	"c00e00000000RIL-a",
+  llihh_2 =	"0000a50c0000RI-a",
+  llihl_2 =	"0000a50d0000RI-a",
+  llilf_2 =	"c00f00000000RIL-a",
+  llilh_2 =	"0000a50e0000RI-a",
+  llill_2 =	"0000a50f0000RI-a",
+  llgfrl_2 =	"c40e00000000RIL-b",
+  llgt_2 =	"e30000000017RXY-a",
+  llgtr_2 =	"0000b9170000RRE",
+  lm_3 =	"000098000000RS-a",
+  lmy_3 =	"eb0000000098RSY-a",
+  lmg_3 =	"eb0000000004RSY-a",
+  lmh_3 =	"eb0000000096RSY-a",
+  lnr_2 =	"000000001100RR",
+  lngr_2 =	"0000b9010000RRE",
+  lngfr_2 =	"0000b9110000RRE",
+  lnxbr_2 =	"0000b3410000RRE",
+  lnxr_2 =	"0000b3610000RRE",
+  lndbr_2 =	"0000b3110000RRE",
+  lndr_2 =	"000000002100RR",
+  lndfr_2 =	"0000b3710000RRE",
+  lnebr_2 =	"0000b3010000RRE",
+  lner_2 =	"000000003100RR",
+  loc_3 =	"eb00000000f2RSY-b",
+  locg_3 =	"eb00000000e2RSY-b",
+  lpq_2 =	"e3000000008fRXY-a",
+  lpr_2 =	"000000001000RR",
+  lpgr_2 =	"0000b9000000RRE",
+  lpgfr_2 =	"0000b9100000RRE",
+  lpxbr_2 =	"0000b3400000RRE",
+  lpxr_2 =	"0000b3600000RRE",
+  lpdbr_2 =	"0000b3100000RRE",
+  lpdr_2 =	"000000002000RR",
+  lpdfr_2 =	"0000b3700000RRE",
+  lpebr_2 =	"0000b3000000RRE",
+  lper_2 =	"000000003000RR",
+  lra_2 =	"0000b1000000RX-a",
+  lray_2 =	"e30000000013RXY-a",
+  lrag_2 =	"e30000000003RXY-a",
+  lrl_2 =	"c40d00000000RIL-b",
+  lgrl_2 =	"c40800000000RIL-b",
+  lgfrl_2 =	"c40c00000000RIL-b",
+  lrvh_2 =	"e3000000001fRXY-a",
+  lrv_2 =	"e3000000001eRXY-a",
+  lrvr_2 =	"0000b91f0000RRE",
+  lrvg_2 =	"e3000000000fRXY-a",
+  lrvgr_2 =	"0000b90f0000RRE",
+  ldxbr_2 =	"0000b3450000RRE",
+  ldxr_2 =	"000000002500RR",
+  lrdr_2 =	"000000002500RR",
+  lexbr_2 =	"0000b3460000RRE",
+  lexr_2 =	"0000b3660000RRE",
+  ledbr_2 =	"0000b3440000RRE",
+  ledr_2 =	"000000003500RR",
+  lrer_2 =	"000000003500RR",
+  lura_2 =	"0000b24b0000RRE",
+  lurag_2 =	"0000b9050000RRE",
+  lzxr_2 =	"0000b3760000RRE",
+  lzdr_2 =	"0000b3750000RRE",
+  lzer_2 =	"0000b3740000RRE",
+  msta_2 =	"0000b2470000RRE",
+  mvcl_2 =	"000000000e00RR",
+  mvcle_3 =	"0000a8000000RS-a",
+  mvclu_3 =	"eb000000008eRSY-a",
+  mvpg_2 =	"0000b2540000RRE",
+  mvst_2 =	"0000b2550000RRE",
+  m_2 =		"00005c000000RX-a",
+  mfy_2 =	"e3000000005cRXY-a",
+  mr_2 =	"000000001c00RR",
+  mxbr_2 =	"0000b34c0000RRE",
+  mxr_2 =	"000000002600RR",
+  mdbr_2 =	"0000b31c0000RRE",
+  md_2 =	"00006c000000RX-a",
+  mdr_2 =	"000000002c00RR",
+  mxdbr_2 =	"0000b3070000RRE",
+  mxd_2 =	"000067000000RX-a",
+  mxdr_2 =	"000000002700RR",
+  meebr_2 =	"0000b3170000RRE",
+  meer_2 =	"0000b3370000RRE",
+  mdebr_2 =	"0000b30c0000RRE",
+  mde_2 =	"00007c000000RX-a",
+  mder_2 =	"000000003c00RR",
+  me_2 =	"00007c000000RX-a",
+  mer_2 =	"000000003c00RR",
+  mh_2 =	"00004c000000RX-a",
+  mhy_2 =	"e3000000007cRXY-a",
+  mlg_2 =	"e30000000086RXY-a",
+  mlgr_2 =	"0000b9860000RRE",
+  ml_2 =	"e30000000096RXY-a",
+  mlr_2 =	"0000b9960000RRE",
+  ms_2 =	"000071000000RX-a",
+  msr_2 =	"0000b2520000RRE",
+  msy_2 =	"e30000000051RXY-a",
+  msg_2 =	"e3000000000cRXY-a",
+  msgr_2 =	"0000b90c0000RRE",
+  msgf_2 =	"e3000000001cRXY-a",
+  msgfr_2 =	"0000b91c0000RRE",
+  msfi_2 =	"c20100000000RIL-a",
+  msgfi_2 =	"c20000000000RIL-a",
+  maer_3 =	"0000b32e0000RRD",
   mvhhi_2 =	"e54400000000SIL",
   mvhi_2 =	"e54c00000000SIL",
   mvghi_2 =	"e54800000000SIL",
-  o_2 =		"000056000000j",
-  or_2 =	"000000001600g",
-  oy_2 =	"e30000000056l",
-  og_2 =	"e30000000081l",
-  ogr_2 =	"0000b9810000h",
-  oihf_2 =	"c00c00000000n",
-  oihh_2 =	"0000a5080000i",
-  oihl_2 =	"0000a5090000i",
-  oilf_2 =	"c00d00000000n",
-  oilh_2 =	"0000a50a0000i",
-  oill_2 =	"0000a50b0000i",
-  pgin_2 =	"0000b22e0000h",
-  pgout_2 =	"0000b22f0000h",
-  pcc_2 =	"0000b92c0000h",
-  pckmo_2 =	"0000b9280000h",
-  pfmf_2 =	"0000b9af0000h",
-  ptf_2 =	"0000b9a20000h",
-  popcnt_2 =	"0000b9e10000h",
+  o_2 =		"000056000000RX-a",
+  or_2 =	"000000001600RR",
+  oy_2 =	"e30000000056RXY-a",
+  og_2 =	"e30000000081RXY-a",
+  ogr_2 =	"0000b9810000RRE",
+  oihf_2 =	"c00c00000000RIL-a",
+  oihh_2 =	"0000a5080000RI-a",
+  oihl_2 =	"0000a5090000RI-a",
+  oilf_2 =	"c00d00000000RIL-a",
+  oilh_2 =	"0000a50a0000RI-a",
+  oill_2 =	"0000a50b0000RI-a",
+  pgin_2 =	"0000b22e0000RRE",
+  pgout_2 =	"0000b22f0000RRE",
+  pcc_2 =	"0000b92c0000RRE",
+  pckmo_2 =	"0000b9280000RRE",
+  pfmf_2 =	"0000b9af0000RRE",
+  ptf_2 =	"0000b9a20000RRE",
+  popcnt_2 =	"0000b9e10000RRE",
   pfd_2 =	"e30000000036m",
-  pfdrl_2 =	"c60200000000p",
-  pt_2 =	"0000b2280000h",
-  pti_2 =	"0000b99e0000h",
-  palb_2 =	"0000b2480000h",
-  rrbe_2 =	"0000b22a0000h",
-  rrbm_2 =	"0000b9ae0000h",
-  rll_3 =	"eb000000001ds",
-  rllg_3 =	"eb000000001cs",
-  srst_2 =	"0000b25e0000h",
-  srstu_2 =	"0000b9be0000h",
-  sar_2 =	"0000b24e0000h",
-  sfpc_2 =	"0000b3840000h",
-  sfasr_2 =	"0000b3850000h",
-  spm_2 =	"000000000400g",
-  ssar_2 =	"0000b2250000h",
-  ssair_2 =	"0000b99f0000h",
-  slda_3 =	"00008f000000q",
-  sldl_3 =	"00008d000000q",
-  sla_3 =	"00008b000000q",
-  slak_3 =	"eb00000000dds",
-  slag_3 =	"eb000000000bs",
-  sll_3 =	"000089000000q",
-  sllk_3 =	"eb00000000dfs",
-  sllg_3 =	"eb000000000ds",
-  srda_3 =	"00008e000000q",
-  srdl_3 =	"00008c000000q",
-  sra_3 =	"00008a000000q",
-  srak_3 =	"eb00000000dcs",
-  srag_3 =	"eb000000000as",
-  srl_3 =	"000088000000q",
-  srlk_3 =	"eb00000000des",
-  srlg_3 =	"eb000000000cs",
-  sqxbr_2 =	"0000b3160000h",
-  sqxr_2 =	"0000b3360000h",
-  sqdbr_2 =	"0000b3150000h",
-  sqdr_2 =	"0000b2440000h",
-  sqebr_2 =	"0000b3140000h",
-  sqer_2 =	"0000b2450000h",
-  st_2 =	"000050000000j",
-  sty_2 =	"e30000000050l",
-  stg_2 =	"e30000000024l",
-  std_2 =	"000060000000j",
-  stdy_2 =	"ed0000000067l",
-  ste_2 =	"000070000000j",
-  stey_2 =	"ed0000000066l",
-  stam_3 =	"00009b000000q",
-  stamy_3 =	"eb000000009bs",
-  stc_2 =	"000042000000j",
-  stcy_2 =	"e30000000072l",
-  stch_2 =	"e300000000c3l",
-  stcmh_3 =	"eb000000002ct",
-  stcm_3 =	"0000be000000r",
-  stcmy_3 =	"eb000000002dt",
-  stctl_3 =	"0000b6000000q",
-  stctg_3 =	"eb0000000025s",
-  sth_2 =	"000040000000j",
-  sthy_2 =	"e30000000070l",
-  sthh_2 =	"e300000000c7l",
-  sthrl_2 =	"c40700000000o",
-  stfh_2 =	"e300000000cbl",
-  stm_3 =	"000090000000q",
-  stmy_3 =	"eb0000000090s",
-  stmg_3 =	"eb0000000024s",
-  stmh_3 =	"eb0000000026s",
-  stoc_3 =	"eb00000000f3t",
-  stocg_3 =	"eb00000000e3t",
-  stpq_2 =	"e3000000008el",
-  strl_2 =	"c40f00000000o",
-  stgrl_2 =	"c40b00000000o",
-  strvh_2 =	"e3000000003fl",
-  strv_2 =	"e3000000003el",
-  strvg_2 =	"e3000000002fl",
-  stura_2 =	"0000b2460000h",
-  sturg_2 =	"0000b9250000h",
-  s_2 =		"00005b000000j",
-  sr_2 =	"000000001b00g",
-  sy_2 =	"e3000000005bl",
-  sg_2 =	"e30000000009l",
-  sgr_2 =	"0000b9090000h",
-  sgf_2 =	"e30000000019l",
-  sgfr_2 =	"0000b9190000h",
-  sxbr_2 =	"0000b34b0000h",
-  sdbr_2 =	"0000b31b0000h",
-  sebr_2 =	"0000b30b0000h",
-  sh_2 =	"00004b000000j",
-  shy_2 =	"e3000000007bl",
-  sl_2 =	"00005f000000j",
-  slr_2 =	"000000001f00g",
-  sly_2 =	"e3000000005fl",
-  slg_2 =	"e3000000000bl",
-  slgr_2 =	"0000b90b0000h",
-  slgf_2 =	"e3000000001bl",
-  slgfr_2 =	"0000b91b0000h",
-  slfi_2 =	"c20500000000n",
-  slgfi_2 =	"c20400000000n",
-  slb_2 =	"e30000000099l",
-  slbr_2 =	"0000b9990000h",
-  slbg_2 =	"e30000000089l",
-  slbgr_2 =	"0000b9890000h",
-  sxr_2 =	"000000003700g",
-  sd_2 =	"00006b000000j",
-  sdr_2 =	"000000002b00g",
-  se_2 =	"00007b000000j",
-  ser_2 =	"000000003b00g",
-  su_2 =	"00007f000000j",
-  sur_2 =	"000000003f00g",
-  sw_2 =	"00006f000000j",
-  swr_2 =	"000000002f00g",
-  tar_2 =	"0000b24c0000h",
-  tb_2 =	"0000b22c0000h",
-  tmhh_2 =	"0000a7020000i",
-  tmhl_2 =	"0000a7030000i",
-  tmlh_2 =	"0000a7000000i",
-  tmll_2 =	"0000a7010000i",
-  trace_3 =	"000099000000q",
-  tracg_3 =	"eb000000000fs",
-  tre_2 =	"0000b2a50000h",
+  pfdrl_2 =	"c60200000000RIL-c",
+  pt_2 =	"0000b2280000RRE",
+  pti_2 =	"0000b99e0000RRE",
+  palb_2 =	"0000b2480000RRE",
+  rrbe_2 =	"0000b22a0000RRE",
+  rrbm_2 =	"0000b9ae0000RRE",
+  rll_3 =	"eb000000001dRSY-a",
+  rllg_3 =	"eb000000001cRSY-a",
+  srst_2 =	"0000b25e0000RRE",
+  srstu_2 =	"0000b9be0000RRE",
+  sar_2 =	"0000b24e0000RRE",
+  sfpc_2 =	"0000b3840000RRE",
+  sfasr_2 =	"0000b3850000RRE",
+  spm_2 =	"000000000400RR",
+  ssar_2 =	"0000b2250000RRE",
+  ssair_2 =	"0000b99f0000RRE",
+  slda_3 =	"00008f000000RS-a",
+  sldl_3 =	"00008d000000RS-a",
+  sla_3 =	"00008b000000RS-a",
+  slak_3 =	"eb00000000ddRSY-a",
+  slag_3 =	"eb000000000bRSY-a",
+  sll_3 =	"000089000000RS-a",
+  sllk_3 =	"eb00000000dfRSY-a",
+  sllg_3 =	"eb000000000dRSY-a",
+  srda_3 =	"00008e000000RS-a",
+  srdl_3 =	"00008c000000RS-a",
+  sra_3 =	"00008a000000RS-a",
+  srak_3 =	"eb00000000dcRSY-a",
+  srag_3 =	"eb000000000aRSY-a",
+  srl_3 =	"000088000000RS-a",
+  srlk_3 =	"eb00000000deRSY-a",
+  srlg_3 =	"eb000000000cRSY-a",
+  sqxbr_2 =	"0000b3160000RRE",
+  sqxr_2 =	"0000b3360000RRE",
+  sqdbr_2 =	"0000b3150000RRE",
+  sqdr_2 =	"0000b2440000RRE",
+  sqebr_2 =	"0000b3140000RRE",
+  sqer_2 =	"0000b2450000RRE",
+  st_2 =	"000050000000RX-a",
+  sty_2 =	"e30000000050RXY-a",
+  stg_2 =	"e30000000024RXY-a",
+  std_2 =	"000060000000RX-a",
+  stdy_2 =	"ed0000000067RXY-a",
+  ste_2 =	"000070000000RX-a",
+  stey_2 =	"ed0000000066RXY-a",
+  stam_3 =	"00009b000000RS-a",
+  stamy_3 =	"eb000000009bRSY-a",
+  stc_2 =	"000042000000RX-a",
+  stcy_2 =	"e30000000072RXY-a",
+  stch_2 =	"e300000000c3RXY-a",
+  stcmh_3 =	"eb000000002cRSY-b",
+  stcm_3 =	"0000be000000RS-b",
+  stcmy_3 =	"eb000000002dRSY-b",
+  stctl_3 =	"0000b6000000RS-a",
+  stctg_3 =	"eb0000000025RSY-a",
+  sth_2 =	"000040000000RX-a",
+  sthy_2 =	"e30000000070RXY-a",
+  sthh_2 =	"e300000000c7RXY-a",
+  sthrl_2 =	"c40700000000RIL-b",
+  stfh_2 =	"e300000000cbRXY-a",
+  stm_3 =	"000090000000RS-a",
+  stmy_3 =	"eb0000000090RSY-a",
+  stmg_3 =	"eb0000000024RSY-a",
+  stmh_3 =	"eb0000000026RSY-a",
+  stoc_3 =	"eb00000000f3RSY-b",
+  stocg_3 =	"eb00000000e3RSY-b",
+  stpq_2 =	"e3000000008eRXY-a",
+  strl_2 =	"c40f00000000RIL-b",
+  stgrl_2 =	"c40b00000000RIL-b",
+  strvh_2 =	"e3000000003fRXY-a",
+  strv_2 =	"e3000000003eRXY-a",
+  strvg_2 =	"e3000000002fRXY-a",
+  stura_2 =	"0000b2460000RRE",
+  sturg_2 =	"0000b9250000RRE",
+  s_2 =		"00005b000000RX-a",
+  sr_2 =	"000000001b00RR",
+  sy_2 =	"e3000000005bRXY-a",
+  sg_2 =	"e30000000009RXY-a",
+  sgr_2 =	"0000b9090000RRE",
+  sgf_2 =	"e30000000019RXY-a",
+  sgfr_2 =	"0000b9190000RRE",
+  sxbr_2 =	"0000b34b0000RRE",
+  sdbr_2 =	"0000b31b0000RRE",
+  sebr_2 =	"0000b30b0000RRE",
+  sh_2 =	"00004b000000RX-a",
+  shy_2 =	"e3000000007bRXY-a",
+  sl_2 =	"00005f000000RX-a",
+  slr_2 =	"000000001f00RR",
+  sly_2 =	"e3000000005fRXY-a",
+  slg_2 =	"e3000000000bRXY-a",
+  slgr_2 =	"0000b90b0000RRE",
+  slgf_2 =	"e3000000001bRXY-a",
+  slgfr_2 =	"0000b91b0000RRE",
+  slfi_2 =	"c20500000000RIL-a",
+  slgfi_2 =	"c20400000000RIL-a",
+  slb_2 =	"e30000000099RXY-a",
+  slbr_2 =	"0000b9990000RRE",
+  slbg_2 =	"e30000000089RXY-a",
+  slbgr_2 =	"0000b9890000RRE",
+  sxr_2 =	"000000003700RR",
+  sd_2 =	"00006b000000RX-a",
+  sdr_2 =	"000000002b00RR",
+  se_2 =	"00007b000000RX-a",
+  ser_2 =	"000000003b00RR",
+  su_2 =	"00007f000000RX-a",
+  sur_2 =	"000000003f00RR",
+  sw_2 =	"00006f000000RX-a",
+  swr_2 =	"000000002f00RR",
+  tar_2 =	"0000b24c0000RRE",
+  tb_2 =	"0000b22c0000RRE",
+  tmhh_2 =	"0000a7020000RI-a",
+  tmhl_2 =	"0000a7030000RI-a",
+  tmlh_2 =	"0000a7000000RI-a",
+  tmll_2 =	"0000a7010000RI-a",
+  trace_3 =	"000099000000RS-a",
+  tracg_3 =	"eb000000000fRSY-a",
+  tre_2 =	"0000b2a50000RRE",
+
 
   -- SS-a instructions
   clc_2 =	"d50000000000SS-a",
@@ -1252,24 +1255,24 @@ local function parse_template(params, template, nparams, pos)
 
   -- Process each character.
   local p = sub(template, 13)
-  if p == "g" then
+  if p == "RR" then
     op2 = op2 + shl(parse_reg(params[1]),4) + parse_reg(params[2])
     wputhw(op2)
-  elseif p == "h" then
+  elseif p == "RRE" then
     op2 = op2 + shl(parse_reg(params[1]),4) + parse_reg(params[2])
     wputhw(op1); wputhw(op2)
-  elseif p == "i" then
+  elseif p == "RI-a" then
     op1 = op1 + shl(parse_reg(params[1]),4)
     wputhw(op1);
     parse_imm16(params[2])
-  elseif p == "j" then
+  elseif p == "RX-a" then
     local d, x, b, a = parse_mem_bx(params[2])
     op1 = op1 + shl(parse_reg(params[1]), 4) + x
     op2 = op2 + shl(b, 12) + d
     wputhw(op1); wputhw(op2);
     if a then a() end
-  elseif p == "k" then
-  elseif p == "l" then
+  elseif p == "RX-b" then
+  elseif p == "RXY-a" then
     local d, x, b, a = parse_mem_bxy(params[2])
     op0 = op0 + shl(parse_reg(params[1]), 4) + x
     op1 = op1 + shl(b, 12) + band(d, 0xfff)
@@ -1278,25 +1281,22 @@ local function parse_template(params, template, nparams, pos)
     if a then a() end
   elseif p == "m" then
 
-  elseif p == "n" then
+  elseif p == "RIL-a" then
     op0 = op0 + shl(parse_reg(params[1]), 4)
     wputhw(op0);
     parse_imm32(params[2])
-  elseif p == "o" then
+  elseif p == "RIL-b" then
     op0 = op0 + shl(parse_reg(params[1]), 4)
     wputhw(op0);
     local mode, n, s = parse_label(params[2])
     waction("REL_"..mode, n, s)
-  elseif p == "q" then
+  elseif p == "RS-a" then
     local d, b, a = parse_mem_b(params[3])
     op1 = op1 + shl(parse_reg(params[1]), 4) + parse_reg(params[2])
     op2 = op2 + shl(b, 12) + d
     wputhw(op1); wputhw(op2)
     if a then a() end -- a() emits action.
-  elseif p == "r" then
-    op2 = op2 + shl(parse_reg(params[1]),12) + shl(parse_reg(params[2]),4) + parse_reg(params[3])
-    wputhw(op1); wputhw(op2)
-  elseif p == "s" then
+  elseif p == "RSY-a" then
     local d, b, a = parse_mem_by(params[3])
     op0 = op0 + shl(parse_reg(params[1]), 4) + parse_reg(params[2])
     op1 = op1 + shl(b, 12) + band(d, 0xfff)
@@ -1357,13 +1357,13 @@ local function parse_template(params, template, nparams, pos)
     wputhw(op1);
     op2 = op2 + shl(parse_reg(params[1]),4) + shl(parse_reg(params[2]),12) + parse_reg(params[3]) + parse_mask(params[4])
     wputhw(op2)
-  elseif p =="sS" then
+  elseif p =="S" then
     wputhw(op1);
     local d, b, a = parse_mem_b(params[1])
     op2 = op2 + shl(b,12) + d;
     wputhw(op2)
     if a then a() end
-  elseif p =="iI" then
+  elseif p =="I" then
     local imm_val, a = parse_imm8(params[1])
     op2 = op2 + imm_val;
     wputhw(op2);