Previous 15994 Revisions Next

r14546 Monday 20th February, 2012 at 07:51:25 UTC by MooglyGuy
[N64] Include the delay slot when checksumming single-instruction blocks in the MIPS3 and RSP DRCs. Fixes Sim City 2000 (Japan). [Ryan Holtz]
[src/emu/cpu/mips]mips3drc.c
[src/emu/cpu/rsp]rspdrc.c

src/emu/cpu/rsp/rspdrc.c
r14545r14546
124124   UINT32            vres[8];               /* used for temporary vector results */
125125
126126   /* register mappings */
127   parameter   regmap[32];               /* parameter to register mappings for all 32 integer registers */
127   parameter   regmap[34];               /* parameter to register mappings for all 32 integer registers */
128128
129129   /* subroutines */
130130   code_handle *   entry;                  /* entry point */
r14545r14546
210210#define VS2REG                  ((op >> 16) & 0x1f)
211211#define EL                     ((op >> 21) & 0xf)
212212
213#define VREG_B(reg, offset)      rsp->v[(reg)].b[BYTE4_XOR_BE(offset)]
214#define VREG_S(reg, offset)      rsp->v[(reg)].s[(offset)^1]
213#define VREG_B(reg, offset)      rsp->v[(reg)].b[(offset)^1]
214#define W_VREG_S(reg, offset)      rsp->v[(reg)].s[(offset)]
215#define VREG_S(reg, offset)      (INT16)rsp->v[(reg)].s[(offset)]
215216
216217#define VEC_EL_2(x,z)            (vector_elements_2[(x)][(z)])
217218
r14545r14546
320321
321322INLINE UINT8 READ8(rsp_state *rsp, UINT32 address)
322323{
323   return rsp->dmem8[BYTE4_XOR_BE(address & 0xfff)];
324   UINT8 ret = rsp->dmem8[BYTE4_XOR_BE(address & 0xfff)];
325   //printf("%04xr%02x\n",address, ret);
326   return ret;
324327}
325328
326329static void cfunc_read8(void *param)
r14545r14546
367370{
368371   address &= 0xfff;
369372   rsp->dmem8[BYTE4_XOR_BE(address)] = data;
370   //printf("%04xw%02x\n",address, data);
373   //printf("%04x:%02x\n",address, data);
371374}
372375
373376static void cfunc_write8(void *param)
r14545r14546
381384   address &= 0xfff;
382385   rsp->dmem8[BYTE4_XOR_BE(address)] = data >> 8;
383386   rsp->dmem8[BYTE4_XOR_BE(address + 1)] = data & 0xff;
384   //printf("%04xw%04x\n",address, data);
387   //printf("%04x:%04x\n",address, data);
385388}
386389
387390static void cfunc_write16(void *param)
r14545r14546
397400   rsp->dmem8[BYTE4_XOR_BE(address + 1)] = (data >> 16) & 0xff;
398401   rsp->dmem8[BYTE4_XOR_BE(address + 2)] = (data >> 8) & 0xff;
399402   rsp->dmem8[BYTE4_XOR_BE(address + 3)] = data & 0xff;
400   //printf("%04xw%08x\n",address, data);
403   //printf("%04x:%08x\n",address, data);
401404}
402405
403406static void cfunc_write32(void *param)
r14545r14546
431434   switch(rsp->impstate->arg2)
432435   {
433436      case 0: // WRITE8
434         printf("%04x:%02x\n", rsp->impstate->arg0 & 0x0fff, (UINT8)rsp->impstate->arg1);
437         printf("%04x:%02x\n", rsp->impstate->arg0 & 0xffff, (UINT8)rsp->impstate->arg1);
435438         break;
436439      case 1: // WRITE16
437         printf("%04x:%04x\n", rsp->impstate->arg0 & 0x0fff, (UINT16)rsp->impstate->arg1);
440         printf("%04x:%04x\n", rsp->impstate->arg0 & 0xffff, (UINT16)rsp->impstate->arg1);
438441         break;
439442      case 2: // WRITE32
440         printf("%04x:%08x\n", rsp->impstate->arg0 & 0x0fff, rsp->impstate->arg1);
443         printf("%04x:%08x\n", rsp->impstate->arg0 & 0xffff, rsp->impstate->arg1);
441444         break;
442445      case 3: // READ8
443         printf("%04xr%02x\n", rsp->impstate->arg0 & 0x0fff, (UINT8)rsp->impstate->arg1);
446         printf("%04xr%02x\n", rsp->impstate->arg0 & 0xffff, (UINT8)rsp->impstate->arg1);
444447         break;
445448      case 4: // READ16
446         printf("%04xr%04x\n", rsp->impstate->arg0 & 0x0fff, (UINT16)rsp->impstate->arg1);
449         printf("%04xr%04x\n", rsp->impstate->arg0 & 0xffff, (UINT16)rsp->impstate->arg1);
447450         break;
448451      case 5: // READ32
449         printf("%04xr%08x\n", rsp->impstate->arg0 & 0x0fff, rsp->impstate->arg1);
452         printf("%04xr%08x\n", rsp->impstate->arg0 & 0xffff, rsp->impstate->arg1);
450453         break;
454      case 6: // Checksum
455         printf("Sum: %08x\n", rsp->impstate->arg0);
456         break;
457      case 7: // Checksum
458         printf("Correct Sum: %08x\n", rsp->impstate->arg0);
459         break;
451460      default: // ???
452         printf("%08x %08x\n", rsp->impstate->arg0 & 0x0fff, rsp->impstate->arg1);
461         printf("%08x %08x\n", rsp->impstate->arg0 & 0xffff, rsp->impstate->arg1);
453462         break;
454463   }
455464}
r14545r14546
860869
861870   end = index + (16 - (ea & 0xf));
862871   if (end > 16) end = 16;
872
863873   for (i=index; i < end; i++)
864874   {
865875      VREG_B(dest, i) = READ8(rsp, ea);
r14545r14546
927937
928938   for (i=0; i < 8; i++)
929939   {
930      VREG_S(dest, i) = READ8(rsp, ea + (((16-index) + i) & 0xf)) << 8;
940      W_VREG_S(dest, i) = READ8(rsp, ea + (((16-index) + i) & 0xf)) << 8;
931941   }
932942}
933943
r14545r14546
956966
957967   for (i=0; i < 8; i++)
958968   {
959      VREG_S(dest, i) = READ8(rsp, ea + (((16-index) + i) & 0xf)) << 7;
969      W_VREG_S(dest, i) = READ8(rsp, ea + (((16-index) + i) & 0xf)) << 7;
960970   }
961971}
962972
r14545r14546
985995
986996   for (i=0; i < 8; i++)
987997   {
988      VREG_S(dest, i) = READ8(rsp, ea + (((16-index) + (i<<1)) & 0xf)) << 7;
998      W_VREG_S(dest, i) = READ8(rsp, ea + (((16-index) + (i<<1)) & 0xf)) << 7;
989999   }
9901000}
9911001
r14545r14546
10201030
10211031   for (i=index >> 1; i < end; i++)
10221032   {
1023      VREG_S(dest, i) = READ8(rsp, ea) << 7;
1033      W_VREG_S(dest, i) = READ8(rsp, ea) << 7;
10241034      ea += 4;
10251035   }
10261036}
r14545r14546
17611771}
17621772
17631773#define WRITEBACK_RESULT() { \
1764      VREG_S(VDREG, 0) = vres[0];   \
1765      VREG_S(VDREG, 1) = vres[1];   \
1766      VREG_S(VDREG, 2) = vres[2];   \
1767      VREG_S(VDREG, 3) = vres[3];   \
1768      VREG_S(VDREG, 4) = vres[4];   \
1769      VREG_S(VDREG, 5) = vres[5];   \
1770      VREG_S(VDREG, 6) = vres[6];   \
1771      VREG_S(VDREG, 7) = vres[7];   \
1774      W_VREG_S(VDREG, 0) = vres[0];   \
1775      W_VREG_S(VDREG, 1) = vres[1];   \
1776      W_VREG_S(VDREG, 2) = vres[2];   \
1777      W_VREG_S(VDREG, 3) = vres[3];   \
1778      W_VREG_S(VDREG, 4) = vres[4];   \
1779      W_VREG_S(VDREG, 5) = vres[5];   \
1780      W_VREG_S(VDREG, 6) = vres[6];   \
1781      W_VREG_S(VDREG, 7) = vres[7];   \
17721782}
17731783
17741784INLINE void cfunc_rsp_vmulf(void *param)
r14545r14546
24152425      {
24162426         for (int i = 0; i < 8; i++)
24172427         {
2418            VREG_S(VDREG, i) = ACCUM_H(i);
2428            W_VREG_S(VDREG, i) = ACCUM_H(i);
24192429         }
24202430         break;
24212431      }
r14545r14546
24232433      {
24242434         for (int i = 0; i < 8; i++)
24252435         {
2426            VREG_S(VDREG, i) = ACCUM_M(i);
2436            W_VREG_S(VDREG, i) = ACCUM_M(i);
24272437         }
24282438         break;
24292439      }
r14545r14546
24312441      {
24322442         for (int i = 0; i < 8; i++)
24332443         {
2434            VREG_S(VDREG, i) = ACCUM_L(i);
2444            W_VREG_S(VDREG, i) = ACCUM_L(i);
24352445         }
24362446         break;
24372447      }
r14545r14546
30913101   rsp->reciprocal_res = rec;
30923102   rsp->dp_allowed = 0;
30933103
3094   VREG_S(VDREG, del) = (UINT16)(rec & 0xffff);
3104   W_VREG_S(VDREG, del) = (UINT16)(rec & 0xffff);
30953105
30963106   for (i = 0; i < 8; i++)
30973107   {
r14545r14546
31833193   rsp->reciprocal_res = rec;
31843194   rsp->dp_allowed = 0;
31853195
3186   VREG_S(VDREG, del) = (UINT16)(rec & 0xffff);
3196   W_VREG_S(VDREG, del) = (UINT16)(rec & 0xffff);
31873197
31883198   for (i = 0; i < 8; i++)
31893199   {
r14545r14546
32153225      ACCUM_L(i) = VREG_S(VS2REG, sel);
32163226   }
32173227
3218   VREG_S(VDREG, del) = (INT16)(rsp->reciprocal_res >> 16);
3228   W_VREG_S(VDREG, del) = (INT16)(rsp->reciprocal_res >> 16);
32193229}
32203230
32213231INLINE void cfunc_rsp_vmov(void *param)
r14545r14546
32323242   int del = VS1REG & 7;
32333243   int sel = EL & 7;
32343244
3235   VREG_S(VDREG, del) = VREG_S(VS2REG, sel);
3245   W_VREG_S(VDREG, del) = VREG_S(VS2REG, sel);
32363246   for (int i = 0; i < 8; i++)
32373247   {
32383248      sel = VEC_EL_2(EL, i);
r14545r14546
33243334   rsp->reciprocal_res = rec;
33253335   rsp->dp_allowed = 0;
33263336
3327   VREG_S(VDREG, del) = (UINT16)(rec & 0xffff);
3337   W_VREG_S(VDREG, del) = (UINT16)(rec & 0xffff);
33283338
33293339   for (i = 0; i < 8; i++)
33303340   {
r14545r14546
33573367      ACCUM_L(i) = VREG_S(VS2REG, sel);
33583368   }
33593369
3360   VREG_S(VDREG, del) = (INT16)(rsp->reciprocal_res >> 16);   // store high part
3370   W_VREG_S(VDREG, del) = (INT16)(rsp->reciprocal_res >> 16);   // store high part
33613371}
33623372
33633373static void cfunc_sp_set_status_cb(void *param)
r14545r14546
34773487      try
34783488      {
34793489         /* start the block */
3480         block = drcuml->begin_block(8192);
3490         block = drcuml->begin_block(4096);
34813491
34823492         /* loop until we get through all instruction sequences */
34833493         for (seqhead = desclist; seqhead != NULL; seqhead = seqlast->next())
r14545r14546
37743784   {
37753785      if (!(seqhead->flags & OPFLAG_VIRTUAL_NOOP))
37763786      {
3787         UINT32 sum = seqhead->opptr.l[0];
37773788         void *base = rsp->direct->read_decrypted_ptr(seqhead->physpc | 0x1000);
37783789         UML_LOAD(block, I0, base, 0, SIZE_DWORD, SCALE_x4);                     // load    i0,base,0,dword
3779         UML_CMP(block, I0, seqhead->opptr.l[0]);                  // cmp     i0,opptr[0]
3790
3791         if (seqhead->delay.first() != NULL && seqhead->physpc != seqhead->delay.first()->physpc)
3792         {
3793            base = rsp->direct->read_decrypted_ptr(seqhead->delay.first()->physpc | 0x1000);
3794            UML_LOAD(block, I1, base, 0, SIZE_DWORD, SCALE_x4);               // load    i1,base,dword
3795            UML_ADD(block, I0, I0, I1);                  // add     i0,i0,i1
3796
3797            sum += seqhead->delay.first()->opptr.l[0];
3798         }
3799
3800         UML_CMP(block, I0, sum);                           // cmp     i0,opptr[0]
37803801         UML_EXHc(block, COND_NE, *rsp->impstate->nocode, epc(seqhead));      // exne    nocode,seqhead->pc
37813802      }
37823803   }
r14545r14546
37953816            UML_LOAD(block, I1, base, 0, SIZE_DWORD, SCALE_x4);                  // load    i1,base,dword
37963817            UML_ADD(block, I0, I0, I1);                     // add     i0,i0,i1
37973818            sum += curdesc->opptr.l[0];
3819
3820            if (curdesc->delay.first() != NULL && (curdesc == seqlast || (curdesc->next() != NULL && curdesc->next()->physpc != curdesc->delay.first()->physpc)))
3821            {
3822               base = rsp->direct->read_decrypted_ptr(curdesc->delay.first()->physpc | 0x1000);
3823               UML_LOAD(block, I1, base, 0, SIZE_DWORD, SCALE_x4);               // load    i1,base,dword
3824               UML_ADD(block, I0, I0, I1);                  // add     i0,i0,i1
3825
3826               sum += curdesc->delay.first()->opptr.l[0];
3827            }
37983828         }
37993829      UML_CMP(block, I0, sum);                                 // cmp     i0,sum
38003830      UML_EXHc(block, COND_NE, *rsp->impstate->nocode, epc(seqhead));         // exne    nocode,seqhead->pc
r14545r14546
38873917   {
38883918      generate_update_cycles(rsp, block, &compiler_temp, desc->targetpc, TRUE);   // <subtract cycles>
38893919      if (desc->flags & OPFLAG_INTRABLOCK_BRANCH)
3890      {
38913920         UML_JMP(block, desc->targetpc | 0x80000000);                     // jmp     desc->targetpc
3892      }
38933921      else
3894      {
38953922         UML_HASHJMP(block, 0, desc->targetpc, *rsp->impstate->nocode);
38963923                                                               // hashjmp <mode>,desc->targetpc,nocode
3897      }
38983924   }
38993925   else
39003926   {
r14545r14546
47514777
47524778      case CPUINFO_INT_INPUT_STATE:               info->i = CLEAR_LINE;               break;
47534779
4754      case CPUINFO_INT_PREVIOUSPC:               info->i = rsp->ppc;                  break;
4780      case CPUINFO_INT_PREVIOUSPC:               info->i = rsp->ppc | 0x04000000;                  break;
47554781
47564782      case CPUINFO_INT_PC:   /* intentional fallthrough */
4757      case CPUINFO_INT_REGISTER + RSP_PC:            info->i = rsp->pc;                  break;
4783      case CPUINFO_INT_REGISTER + RSP_PC:            info->i = rsp->pc | 0x04000000;                  break;
47584784
47594785      case CPUINFO_INT_REGISTER + RSP_R0:            info->i = rsp->r[0];                  break;
47604786      case CPUINFO_INT_REGISTER + RSP_R1:            info->i = rsp->r[1];                  break;
r14545r14546
47884814      case CPUINFO_INT_REGISTER + RSP_R29:         info->i = rsp->r[29];               break;
47894815      case CPUINFO_INT_REGISTER + RSP_R30:         info->i = rsp->r[30];               break;
47904816      case CPUINFO_INT_SP:
4791      case CPUINFO_INT_REGISTER + RSP_R31:         info->i = rsp->r[31];               break;
4817      case CPUINFO_INT_REGISTER + RSP_R31:         info->i = rsp->r[31];                break;
47924818      case CPUINFO_INT_REGISTER + RSP_SR:             info->i = rsp->sr;                       break;
4793      case CPUINFO_INT_REGISTER + RSP_NEXTPC:         info->i = rsp->nextpc;                  break;
4819      case CPUINFO_INT_REGISTER + RSP_NEXTPC:         info->i = rsp->nextpc | 0x04000000;      break;
47944820      case CPUINFO_INT_REGISTER + RSP_STEPCNT:        info->i = rsp->step_count;               break;
47954821
47964822      /* --- the following bits of info are returned as pointers to data or functions --- */
r14545r14546
48124838
48134839      case CPUINFO_STR_FLAGS:                     strcpy(info->s, " ");               break;
48144840
4815      case CPUINFO_STR_REGISTER + RSP_PC:            sprintf(info->s, "PC: %08X", rsp->pc);   break;
4841      case CPUINFO_STR_REGISTER + RSP_PC:            sprintf(info->s, "PC: %08X", rsp->pc | 0x04000000);   break;
48164842
48174843      case CPUINFO_STR_REGISTER + RSP_R0:            sprintf(info->s, "R0: %08X", rsp->r[0]); break;
48184844      case CPUINFO_STR_REGISTER + RSP_R1:            sprintf(info->s, "R1: %08X", rsp->r[1]); break;
src/emu/cpu/mips/mips3drc.c
r14545r14546
15241524   {
15251525      if (!(seqhead->flags & OPFLAG_VIRTUAL_NOOP))
15261526      {
1527         UINT32 sum = seqhead->opptr.l[0];
15271528         void *base = mips3->direct->read_decrypted_ptr(seqhead->physpc);
15281529         UML_LOAD(block, I0, base, 0, SIZE_DWORD, SCALE_x4);         // load    i0,base,0,dword
1529         UML_CMP(block, I0, seqhead->opptr.l[0]);                  // cmp     i0,opptr[0]
1530
1531         if (seqhead->delay.first() != NULL && seqhead->physpc != seqhead->delay.first()->physpc)
1532         {
1533            base = mips3->direct->read_decrypted_ptr(seqhead->delay.first()->physpc);
1534            UML_LOAD(block, I1, base, 0, SIZE_DWORD, SCALE_x4);               // load    i1,base,dword
1535            UML_ADD(block, I0, I0, I1);                  // add     i0,i0,i1
1536
1537            sum += seqhead->delay.first()->opptr.l[0];
1538         }
1539
1540         UML_CMP(block, I0, sum);                           // cmp     i0,opptr[0]
15301541         UML_EXHc(block, COND_NE, *mips3->impstate->nocode, epc(seqhead));      // exne    nocode,seqhead->pc
15311542      }
15321543   }
r14545r14546
17021713
17031714   /* fetch the target register if dynamic, in case it is modified by the delay slot */
17041715   if (desc->targetpc == BRANCH_TARGET_DYNAMIC)
1716   {
17051717      UML_MOV(block, mem(&mips3->impstate->jmpdest), R32(RSREG));               // mov     [jmpdest],<rsreg>
17061718
1719   }
1720
17071721   /* set the link if needed -- before the delay slot */
17081722   if (linkreg != 0)
1723   {
17091724      UML_DMOV(block, R64(linkreg), (INT32)(desc->pc + 8));               // dmov    <linkreg>,desc->pc + 8
1725   }
17101726
17111727   /* compile the delay slot using temporary compiler state */
17121728   assert(desc->delay.first() != NULL);

Previous 15994 Revisions Next


© 1998-2018 The MESS Team