comparison tools/gfxconv.c @ 1852:219417325036

Split dmC64GetOpMemBlockAndName() into dmC64GetOpMemBlock() and dmC64GetOpSubjectName() functions for some flexibility.
author Matti Hamalainen <ccr@tnsp.org>
date Fri, 22 Jun 2018 23:40:20 +0300
parents bda7f82f221e
children f382cde6bb58
comparison
equal deleted inserted replaced
1851:cfc7046fb176 1852:219417325036
1012 // Do per opcode copies 1012 // Do per opcode copies
1013 for (int i = 0; i < D64_MAX_ENCDEC_OPS; i++) 1013 for (int i = 0; i < D64_MAX_ENCDEC_OPS; i++)
1014 { 1014 {
1015 const DMC64EncDecOp *op = fmtGetEncDecOp(dstFmt, i); 1015 const DMC64EncDecOp *op = fmtGetEncDecOp(dstFmt, i);
1016 DMC64MemBlock *srcBlk = NULL, *dstBlk = NULL; 1016 DMC64MemBlock *srcBlk = NULL, *dstBlk = NULL;
1017 char *blkname = NULL; 1017 const char *blkname = NULL;
1018 size_t size; 1018 size_t size;
1019 1019
1020 if (op->type == DO_LAST) 1020 if (op->type == DO_LAST)
1021 break; 1021 break;
1022 1022
1026 case DO_COPY: 1026 case DO_COPY:
1027 case DO_SET_MEM: 1027 case DO_SET_MEM:
1028 case DO_SET_MEM_HI: 1028 case DO_SET_MEM_HI:
1029 case DO_SET_MEM_LO: 1029 case DO_SET_MEM_LO:
1030 case DO_SET_OP: 1030 case DO_SET_OP:
1031 dmC64GetOpMemBlockAndName(src, op->subject, op->bank, (const DMC64MemBlock **) &srcBlk, &blkname); 1031 dmC64GetOpMemBlock(src, op->subject, op->bank, (const DMC64MemBlock **) &srcBlk);
1032 dmC64GetOpMemBlockAndName(dst, op->subject, op->bank, (const DMC64MemBlock **) &dstBlk, &blkname); 1032 dmC64GetOpMemBlock(dst, op->subject, op->bank, (const DMC64MemBlock **) &dstBlk);
1033 blkname = dmC64GetOpSubjectName(op->subject);
1033 1034
1034 // Skip if we did previous fixups/upconverts 1035 // Skip if we did previous fixups/upconverts
1035 if (dstBlk != NULL && dstBlk->data != NULL) 1036 if (dstBlk != NULL && dstBlk->data != NULL)
1036 break; 1037 break;
1037 1038