diff --git a/Ghidra/Processors/tricore/data/manuals/tricore2.idx b/Ghidra/Processors/tricore/data/manuals/tricore2.idx
index 94a9259431..843daad367 100644
--- a/Ghidra/Processors/tricore/data/manuals/tricore2.idx
+++ b/Ghidra/Processors/tricore/data/manuals/tricore2.idx
@@ -1,358 +1,358 @@
-@Infineon-TC2xx_Architecture_vol2-UM-v01_00-EN.pdf[tcarch_vol2_a4.book]
-ABS, 51
-ABS.B, 52
-ABSDIF, 54
-ABSDIF.B, 55
-ABSDIF.H, 55
-ABSDIFS, 57
-ABSDIFS.H, 58
-ABS.H, 52
-ABSS, 59
-ABSS.H, 60
-ADD, 61
-ADD.A, 64
-ADD.B, 65
-ADDC, 67
-ADD.F, 461
-ADD.H, 65
-ADDI, 68
-ADDIH, 69
-ADDIH.A, 70
-ADDS, 71
-ADDSC.A, 76
-ADDSC.AT, 76
-ADDS.H, 73
-ADDS.HU, 73
-ADDS.U, 75
-ADDX, 78
-AND, 79
-AND.ANDN.T, 81
-AND.AND.T, 81
-AND.EQ, 83
-AND.GE, 84
-AND.GE.U, 84
-AND.LT, 86
-AND.LT.U, 86
-ANDN, 90
-AND.NE, 88
-AND.NOR.T, 81
-ANDN.T, 91
-AND.OR.T, 81
-AND.T, 89
-BISR, 92
-BMERGE, 94
-BSPLIT, 95
-CACHEA.I, 96
-CACHEA.W, 98
-CACHEA.WI, 100
-CACHEI.I, 104
-CACHEI.W, 102
-CACHEI.WI, 106
-CADD, 108
-CADDN, 110
-CALL, 112
-CALLA, 114
-CALLI, 116
-CLO, 118
-CLO.H, 119
-CLS, 120
-CLS.H, 121
-CLZ, 122
-CLZ.H, 123
-CMOV, 124
-CMOVN, 125
-CMP.F, 462
-CMPSWAP.W, 126
-COP, 493
-CRC32, 128
-CSUB, 129
-CSUBN, 130
-DEBUG, 131
-DEXTR, 132
-DISABLE, 133
-DIV, 137
-DIV.F, 463
-DIV.U, 137
-DSYNC, 134
-DVADJ, 135
-DVINIT, 139
-DVINIT.B, 139
-DVINIT.BU, 139
-DVINIT.H, 139
-DVINIT.HU, 139
-DVINIT.U, 139
-DVSTEP, 142
-DVSTEP.U, 142
-ENABLE, 144
-EQ, 145
-EQ.A, 147
-EQANY.B, 150
-EQANY.H, 150
-EQ.B, 148
-EQ.H, 148
-EQ.W, 148
-EQZ.A, 152
-EXTR, 153
-EXTR.U, 153
-FCALL, 155
-FCALLA, 156
-FCALLI, 157
-FRET, 158
-FTOI, 464
-FTOIZ, 465
-FTOQ31, 466
-FTOQ31Z, 467
-FTOU, 468
-FTOUZ, 469
-GE, 159
-GE.A, 161
-GE.U, 159
-IMASK, 162
-INSERT, 165
-INSN.T, 164
-INS.T, 164
-ISYNC, 167
-ITOF, 470
-IXMAX, 168
-IXMAX.U, 168
-IXMIN, 170
-IXMIN.U, 170
-J, 172
-JA, 173
-JEQ, 174
-JEQ.A, 176
-JGE, 177
-JGE.U, 177
-JGEZ, 179
-JGTZ, 180
-JI, 181
-JL, 182
-JLA, 183
-JLEZ, 184
-JLI, 185
-JLT, 186
-JLT.U, 186
-JLTZ, 188
-JNE, 189
-JNE.A, 191
-JNED, 192
-JNEI, 193
-JNZ, 194
-JNZ.A, 195
-JNZ.T, 196
-JZ, 197
-JZ.A, 198
-JZ.T, 199
-LD.A, 200
-LD.B, 203
-LD.BU, 203
-LD.D, 208
-LD.DA, 210
-LD.DD, 212
-LD.H, 214
-LD.HU, 214
-LDLCX, 224
-LDMST, 225
-LD.Q, 219
-LDUCX, 227
-LD.W, 221
-LEA, 228
-LOOP, 229
-LOOPU, 230
-LT, 231
-LT.A, 233
-LT.B, 234
-LT.BU, 234
-LT.H, 235
-LT.HU, 235
-LT.U, 231
-LT.W, 236
-LT.WU, 236
-MADD, 237
-MADD.F, 471
-MADD.H, 240
-MADDM.H, 252
-MADDMS.H, 252
-MADD.Q, 244
-MADDR.H, 255
-MADDR.Q, 259
-MADDRS.H, 255
-MADDRS.Q, 259
-MADDS, 237
-MADDS.H, 240
-MADDS.Q, 244
-MADDS.U, 250
-MADDSU.H, 261
-MADDSUM.H, 265
-MADDSUMS.H, 265
-MADDSUR.H, 268
-MADDSURS.H, 268
-MADDSUS.H, 261
-MADD.U, 250
-MAX, 272
-MAX.B, 274
-MAX.BU, 274
-MAX.H, 275
-MAX.HU, 275
-MAX.U, 272
-MFCR, 276
-MFFR, 473
-MIN, 277
-MIN.B, 279
-MIN.BU, 279
-MIN.H, 280
-MIN.HU, 280
-MIN.U, 277
-MOV, 281
-MOV.A, 284
-MOV.AA, 285
-MOV.D, 286
-MOVH, 288
-MOVH.A, 289
-MOV.U, 287
-MSUB, 290
-MSUBAD.H, 305
-MSUBADM.H, 309
-MSUBADMS.H, 309
-MSUBADR.H, 312
-MSUBADRS.H, 312
-MSUBADS.H, 305
-MSUB.F, 474
-MSUB.H, 293
-MSUBM.H, 316
-MSUBMS.H, 316
-MSUB.Q, 297
-MSUBR.H, 319
-MSUBR.Q, 323
-MSUBRS.H, 319
-MSUBRS.Q, 323
-MSUBS, 290
-MSUBS.H, 293
-MSUBS.Q, 297
-MSUBS.U, 303
-MSUB.U, 303
-MTCR, 325
-MTFR, 476
-MUL, 326
-MUL.F, 477
-MUL.H, 329
-MULM.H, 336
-MULMS.H, 338
-MUL.Q, 331
-MULR.H, 339
-MULR.Q, 341
-MULS, 326
-MULS.U, 334
-MUL.U, 334
-NAND, 342
-NAND.T, 343
-NE, 344
-NE.A, 345
-NEZ.A, 346
-NOP, 347
-NOR, 348
-NOR.T, 349
-NOT, 350
-OR, 351
-OR.ANDN.T, 353
-OR.AND.T, 353
-OR.EQ, 355
-OR.GE, 356
-OR.GE.U, 356
-OR.LT, 358
-OR.LT.U, 358
-ORN, 362
-OR.NE, 360
-OR.NOR.T, 353
-ORN.T, 363
-OR.OR.T, 353
-OR.T, 361
-PACK, 364
-PARITY, 366
-Q31TOF, 478
-QSEED.F, 479
-RESTORE, 367
-RET, 368
-RFE, 370
-RFM, 372
-RSLCX, 373
-RSTV, 374
-RSUB, 375
-RSUBS, 376
-RSUBS.U, 376
-SAT.B, 377
-SAT.BU, 378
-SAT.H, 379
-SAT.HU, 380
-SEL, 381
-SELN, 382
-SH, 383
-SHA, 394
-SHA.H, 396
-SH.ANDN.T, 392
-SH.AND.T, 392
-SHAS, 398
-SH.EQ, 385
-SH.GE, 386
-SH.GE.U, 386
-SH.H, 388
-SH.LT, 389
-SH.LT.U, 389
-SH.NAND.T, 392
-SH.NE, 391
-SH.NOR.T, 392
-SH.ORN.T, 392
-SH.OR.T, 392
-SH.XNOR.T, 392
-SH.XOR.T, 392
-ST.A, 400
-ST.B, 403
-ST.D, 406
-ST.DA, 409
-ST.DD, 411
-ST.H, 413
-STLCX, 422
-ST.Q, 416
-ST.T, 418
-STUCX, 423
-ST.W, 419
-SUB, 424
-SUB.A, 426
-SUB.B, 427
-SUBC, 429
-SUB.F, 480
-SUB.H, 427
-SUBS, 430
-SUBS.H, 432
-SUBS.HU, 432
-SUBS.U, 430
-SUBX, 434
-SVLCX, 435
-SWAPMSK.W, 439
-SWAP.W, 436
-SYSCALL, 442
-TLBDEMAP, 484
-TLBFLUSH.A, 485
-TLBFLUSH.B, 485
-TLBMAP, 486
-TLBPROBE.A, 487
-TLBPROBE.I, 489
-TRAPSV, 443
-TRAPV, 444
-UNPACK, 445
-UPDFL, 481
-UTOF, 482
-WAIT, 447
-XNOR, 448
-XNOR.T, 449
-XOR, 450
-XOR.EQ, 451
-XOR.GE, 452
-XOR.GE.U, 452
-XOR.LT, 454
-XOR.LT.U, 454
-XOR.NE, 456
-XOR.T, 457
-XPOSE.B, 458
-XPOSE.H, 458
-YIELD, 491
+@Infineon-TC2xx_Architecture_vol2-UM-v01_00-EN.pdf [TriCore TC1.6P & TC1.6E Instruction Set, User Manual (Volume 2), V1.0 2013-07]
+ABS, 49
+ABS.B, 50
+ABS.H, 50
+ABSDIF, 52
+ABSDIF.B, 53
+ABSDIF.H, 53
+ABSDIFS, 55
+ABSDIFS.H, 56
+ABSS, 57
+ABSS.H, 58
+ADD, 59
+ADD.A, 62
+ADD.B, 63
+ADD.F, 447
+ADD.H, 63
+ADDC, 65
+ADDI, 66
+ADDIH, 67
+ADDIH.A, 68
+ADDS, 69
+ADDS.H, 71
+ADDS.HU, 71
+ADDS.U, 73
+ADDSC.A, 74
+ADDSC.AT, 74
+ADDX, 76
+AND, 77
+AND.AND.T, 79
+AND.ANDN.T, 79
+AND.EQ, 81
+AND.GE, 82
+AND.GE.U, 82
+AND.LT, 84
+AND.LT.U, 84
+AND.NE, 86
+AND.NOR.T, 79
+AND.OR.T, 79
+AND.T, 87
+ANDN, 88
+ANDN.T, 89
+BISR, 90
+BMERGE, 92
+BSPLIT, 93
+CACHEA.I, 94
+CACHEA.W, 96
+CACHEA.WI, 98
+CACHEI.I, 102
+CACHEI.W, 100
+CACHEI.WI, 104
+CADD, 106
+CADDN, 108
+CALL, 110
+CALLA, 112
+CALLI, 113
+CLO, 115
+CLO.H, 116
+CLS, 117
+CLS.H, 118
+CLZ, 119
+CLZ.H, 120
+CMOV, 121
+CMOVN, 122
+CMP.F, 448
+CMPSWAP.W, 123
+# COP, 
+CRC32, 125
+CSUB, 126
+CSUBN, 127
+DEBUG, 128
+DEXTR, 129
+DISABLE, 130
+DIV, 134
+DIV.F, 449
+DIV.U, 134
+DSYNC, 131
+DVADJ, 132
+DVINIT, 136
+DVINIT.B, 136
+DVINIT.BU, 136
+DVINIT.H, 136
+DVINIT.HU, 136
+DVINIT.U, 136
+DVSTEP, 139
+DVSTEP.U, 139
+ENABLE, 141
+EQ, 142
+EQ.A, 144
+EQ.B, 145
+EQ.H, 145
+EQ.W, 145
+EQANY.B, 147
+EQANY.H, 147
+EQZ.A, 149
+EXTR, 150
+EXTR.U, 150
+FCALL, 152
+FCALLA, 153
+FCALLI, 154
+FRET, 155
+FTOI, 450
+FTOIZ, 451
+FTOQ31, 452
+FTOQ31Z, 453
+FTOU, 454
+FTOUZ, 455
+GE, 156
+GE.A, 158
+GE.U, 156
+IMASK, 159
+INS.T, 161
+INSERT, 162
+INSN.T, 161
+ISYNC, 164
+ITOF, 456
+IXMAX, 165
+IXMAX.U, 165
+IXMIN, 167
+IXMIN.U, 167
+J, 169
+JA, 170
+JEQ, 171
+JEQ.A, 173
+JGE, 174
+JGE.U, 174
+JGEZ, 176
+JGTZ, 177
+JI, 178
+JL, 179
+JLA, 180
+JLEZ, 181
+JLI, 182
+JLT, 183
+JLT.U, 183
+JLTZ, 185
+JNE, 186
+JNE.A, 188
+JNED, 189
+JNEI, 190
+JNZ, 191
+JNZ.A, 192
+JNZ.T, 193
+JZ, 194
+JZ.A, 195
+JZ.T, 196
+LD.A, 197
+LD.B, 200
+LD.BU, 200
+LD.D, 204
+LD.DA, 206
+# LD.DD, 
+LD.H, 208
+LD.HU, 208
+LD.Q, 212
+LD.W, 214
+LDLCX, 217
+LDMST, 218
+LDUCX, 220
+LEA, 221
+LOOP, 222
+LOOPU, 223
+LT, 224
+LT.A, 226
+LT.B, 227
+LT.BU, 227
+LT.H, 228
+LT.HU, 228
+LT.U, 224
+LT.W, 229
+LT.WU, 229
+MADD, 230
+MADD.F, 457
+MADD.H, 233
+MADD.Q, 237
+MADD.U, 243
+MADDM.H, 245
+MADDMS.H, 245
+MADDR.H, 248
+MADDR.Q, 252
+MADDRS.H, 248
+MADDRS.Q, 252
+MADDS, 230
+MADDS.H, 233
+MADDS.Q, 237
+MADDS.U, 243
+MADDSU.H, 254
+MADDSUM.H, 258
+MADDSUMS.H, 258
+MADDSUR.H, 261
+MADDSURS.H, 261
+MADDSUS.H, 254
+MAX, 265
+MAX.B, 267
+MAX.BU, 267
+MAX.H, 268
+MAX.HU, 268
+MAX.U, 265
+MFCR, 269
+# MFFR, 
+MIN, 270
+MIN.B, 272
+MIN.BU, 272
+MIN.H, 273
+MIN.HU, 273
+MIN.U, 270
+MOV, 274
+MOV.A, 277
+MOV.AA, 278
+MOV.D, 279
+MOV.U, 280
+MOVH, 281
+MOVH.A, 282
+MSUB, 283
+MSUB.F, 459
+MSUB.H, 286
+MSUB.Q, 290
+MSUB.U, 296
+MSUBAD.H, 298
+MSUBADM.H, 302
+MSUBADMS.H, 302
+MSUBADR.H, 305
+MSUBADRS.H, 305
+MSUBADS.H, 298
+MSUBM.H, 309
+MSUBMS.H, 309
+MSUBR.H, 312
+MSUBR.Q, 316
+MSUBRS.H, 312
+MSUBRS.Q, 316
+MSUBS, 283
+MSUBS.H, 286
+MSUBS.Q, 290
+MSUBS.U, 296
+MTCR, 318
+# MTFR, 
+MUL, 319
+MUL.F, 461
+MUL.H, 322
+MUL.Q, 324
+MUL.U, 327
+MULM.H, 329
+MULMS.H, 331
+MULR.H, 332
+MULR.Q, 334
+MULS, 319
+MULS.U, 327
+NAND, 335
+NAND.T, 336
+NE, 337
+NE.A, 338
+NEZ.A, 339
+NOP, 340
+NOR, 341
+NOR.T, 342
+NOT, 343
+OR, 344
+OR.AND.T, 346
+OR.ANDN.T, 346
+OR.EQ, 348
+OR.GE, 349
+OR.GE.U, 349
+OR.LT, 351
+OR.LT.U, 351
+OR.NE, 353
+OR.NOR.T, 346
+OR.OR.T, 346
+OR.T, 354
+ORN, 355
+ORN.T, 356
+PACK, 357
+PARITY, 359
+Q31TOF, 462
+QSEED.F, 463
+RESTORE, 360
+RET, 361
+RFE, 363
+RFM, 365
+RSLCX, 366
+RSTV, 367
+RSUB, 368
+RSUBS, 369
+RSUBS.U, 369
+SAT.B, 370
+SAT.BU, 371
+SAT.H, 372
+SAT.HU, 373
+SEL, 374
+SELN, 375
+SH, 376
+SH.AND.T, 385
+SH.ANDN.T, 385
+SH.EQ, 378
+SH.GE, 379
+SH.GE.U, 379
+SH.H, 381
+SH.LT, 382
+SH.LT.U, 382
+SH.NAND.T, 385
+SH.NE, 384
+SH.NOR.T, 385
+SH.OR.T, 385
+SH.ORN.T, 385
+SH.XNOR.T, 385
+SH.XOR.T, 385
+SHA, 387
+SHA.H, 389
+SHAS, 391
+ST.A, 393
+ST.B, 396
+ST.D, 399
+ST.DA, 401
+# ST.DD, 
+ST.H, 403
+ST.Q, 406
+ST.T, 408
+ST.W, 409
+STLCX, 412
+STUCX, 413
+SUB, 414
+SUB.A, 416
+SUB.B, 417
+SUB.F, 464
+SUB.H, 417
+SUBC, 419
+SUBS, 420
+SUBS.H, 422
+SUBS.HU, 422
+SUBS.U, 420
+SUBX, 424
+SVLCX, 425
+SWAP.W, 426
+SWAPMSK.W, 428
+SYSCALL, 430
+# TLBDEMAP, 
+# TLBFLUSH.A, 
+# TLBFLUSH.B, 
+# TLBMAP, 
+# TLBPROBE.A, 
+# TLBPROBE.I, 
+TRAPSV, 431
+TRAPV, 432
+UNPACK, 433
+UPDFL, 465
+UTOF, 466
+WAIT, 435
+XNOR, 436
+XNOR.T, 437
+XOR, 438
+XOR.EQ, 439
+XOR.GE, 440
+XOR.GE.U, 440
+XOR.LT, 442
+XOR.LT.U, 442
+XOR.NE, 444
+XOR.T, 445
+# XPOSE.B, 
+# XPOSE.H, 
+# YIELD,