From 65514d85d5d534dfbca3d414ce6eb64ef73cb73b Mon Sep 17 00:00:00 2001 From: notaz Date: Mon, 8 Jul 2013 02:44:16 +0300 Subject: [PATCH] 32x: add some comments --- cpu/sh2/compiler.c | 8 ++++---- pico/32x/memory.c | 20 ++++++++++++++++---- 2 files changed, 20 insertions(+), 8 deletions(-) diff --git a/cpu/sh2/compiler.c b/cpu/sh2/compiler.c index 5b52694..10d4c01 100644 --- a/cpu/sh2/compiler.c +++ b/cpu/sh2/compiler.c @@ -166,9 +166,9 @@ static const int reg_map_g2h[] = { 4, 5, 6, 7, 8, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, 9, - -1, -1, -1, 10, - -1, -1, -1, -1, + -1, -1, -1, 9, // r12 .. sp + -1, -1, -1, 10, // SHR_PC, SHR_PPC, SHR_PR, SHR_SR, + -1, -1, -1, -1, // SHR_GBR, SHR_VBR, SHR_MACH, SHR_MACL, }; static temp_reg_t reg_temp[] = { @@ -2986,7 +2986,7 @@ int sh2_execute(SH2 *sh2c, int cycles) sh2c->cycles_timeslice = cycles; // cycles are kept in SHR_SR unused bits (upper 20) - // bit19 contains T saved for delay slot + // bit11 contains T saved for delay slot // others are usual SH2 flags sh2c->sr &= 0x3f3; sh2c->sr |= cycles << 12; diff --git a/pico/32x/memory.c b/pico/32x/memory.c index 531a286..109aaf4 100644 --- a/pico/32x/memory.c +++ b/pico/32x/memory.c @@ -1,13 +1,10 @@ /* * PicoDrive - * (C) notaz, 2009,2010 + * (C) notaz, 2009,2010,2013 * * This work is licensed under the terms of MAME license. * See COPYING file in the top-level directory. * - * SH2 addr lines: - * iii. .cc. ..xx * // Internal, Cs, x - * * Register map: * a15100 F....... R.....EA F.....AC N...VHMP 4000 // Fm Ren nrEs Aden Cart heN V H cMd Pwm * a15102 ........ ......SM ? 4002 // intS intM @@ -25,6 +22,21 @@ * a1511e ? ? 401e * a15120 (16 bytes comm) 2020 * a15130 (PWM) 2030 + * + * SH2 addr lines: + * iii. .cc. ..xx * // Internal, Cs, x + * + * sh2 map, wait/bus cycles (from docs): + * r w + * rom 0000000-0003fff 1 - + * sys reg 0004000-00040ff 1 1 + * vdp reg 0004100-00041ff 5 5 + * vdp pal 0004200-00043ff 5 5 + * rom 2000000-23fffff 6-15 + * dram/fb 4000000-401ffff 5-12 1-3 + * fb ovr 4020000-403ffff + * sdram 6000000-603ffff 12 2 (cycles) + * d.a. c0000000-? */ #include "../pico_int.h" #include "../memory.h" -- 2.39.2