diff options
Diffstat (limited to 'src/mame/machine/model1.cpp')
-rw-r--r-- | src/mame/machine/model1.cpp | 148 |
1 files changed, 74 insertions, 74 deletions
diff --git a/src/mame/machine/model1.cpp b/src/mame/machine/model1.cpp index a9a4473bcc2..f763ab83701 100644 --- a/src/mame/machine/model1.cpp +++ b/src/mame/machine/model1.cpp @@ -13,19 +13,19 @@ #define TGP_FUNCTION(name) void name() -UINT32 model1_state::fifoout_pop() +uint32_t model1_state::fifoout_pop() { if(m_fifoout_wpos == m_fifoout_rpos) { fatalerror("TGP FIFOOUT underflow (%x)\n", safe_pc()); } - UINT32 v = m_fifoout_data[m_fifoout_rpos++]; + uint32_t v = m_fifoout_data[m_fifoout_rpos++]; if(m_fifoout_rpos == FIFO_SIZE) m_fifoout_rpos = 0; return v; } -void model1_state::fifoout_push(UINT32 data) +void model1_state::fifoout_push(uint32_t data) { if(!m_puuu) logerror("TGP: Push %d\n", data); @@ -46,17 +46,17 @@ void model1_state::fifoout_push_f(float data) fifoout_push(f2u(data)); } -UINT32 model1_state::fifoin_pop() +uint32_t model1_state::fifoin_pop() { if(m_fifoin_wpos == m_fifoin_rpos) logerror("TGP FIFOIN underflow\n"); - UINT32 v = m_fifoin_data[m_fifoin_rpos++]; + uint32_t v = m_fifoin_data[m_fifoin_rpos++]; if(m_fifoin_rpos == FIFO_SIZE) m_fifoin_rpos = 0; return v; } -void model1_state::fifoin_push(UINT32 data) +void model1_state::fifoin_push(uint32_t data) { // logerror("TGP FIFOIN write %08x (%x)\n", data, safe_pc()); m_fifoin_data[m_fifoin_wpos++] = data; @@ -80,7 +80,7 @@ void model1_state::next_fn() m_fifoin_cb = m_swa ? &model1_state::function_get_swa : &model1_state::function_get_vf; } -static float tcos(INT16 a) +static float tcos(int16_t a) { if(a == 16384 || a == -16384) return 0; @@ -92,7 +92,7 @@ static float tcos(INT16 a) return cos(a*(2*M_PI/65536.0)); } -static float tsin(INT16 a) +static float tsin(int16_t a) { if(a == 0 || a == -32768) return 0; @@ -104,7 +104,7 @@ static float tsin(INT16 a) return sin(a*(2*M_PI/65536.0)); } -UINT16 model1_state::ram_get_i() +uint16_t model1_state::ram_get_i() { return m_ram_data[m_ram_scanadr++]; } @@ -236,14 +236,14 @@ TGP_FUNCTION( model1_state::anglev ) if(a>=0) fifoout_push(0); else - fifoout_push((UINT32)-32768); + fifoout_push((uint32_t)-32768); } else if(!a) { if(b>=0) fifoout_push(16384); else - fifoout_push((UINT32)-16384); + fifoout_push((uint32_t)-16384); } else - fifoout_push((INT16)(atan2(b, a)*32768/M_PI)); + fifoout_push((int16_t)(atan2(b, a)*32768/M_PI)); next_fn(); } @@ -295,7 +295,7 @@ TGP_FUNCTION( model1_state::normalize ) TGP_FUNCTION( model1_state::acc_seti ) { - INT32 a = fifoin_pop(); + int32_t a = fifoin_pop(); m_dump = true; logerror("TGP acc_seti %d (%x)\n", a, m_pushpc); m_acc = a; @@ -304,7 +304,7 @@ TGP_FUNCTION( model1_state::acc_seti ) TGP_FUNCTION( model1_state::track_select ) { - INT32 a = fifoin_pop(); + int32_t a = fifoin_pop(); logerror("TGP track_select %d (%x)\n", a, m_pushpc); m_tgp_vr_select = a; next_fn(); @@ -346,14 +346,14 @@ TGP_FUNCTION( model1_state::anglep ) if(c>=0) fifoout_push(0); else - fifoout_push((UINT32)-32768); + fifoout_push((uint32_t)-32768); } else if(!c) { if(d>=0) fifoout_push(16384); else - fifoout_push((UINT32)-16384); + fifoout_push((uint32_t)-16384); } else - fifoout_push((INT16)(atan2(d, c)*32768/M_PI)); + fifoout_push((int16_t)(atan2(d, c)*32768/M_PI)); next_fn(); } @@ -411,7 +411,7 @@ TGP_FUNCTION( model1_state::matrix_scale ) TGP_FUNCTION( model1_state::matrix_rotx ) { - INT16 a = fifoin_pop(); + int16_t a = fifoin_pop(); float s = tsin(a); float c = tcos(a); float t1, t2; @@ -433,7 +433,7 @@ TGP_FUNCTION( model1_state::matrix_rotx ) TGP_FUNCTION( model1_state::matrix_roty ) { - INT16 a = fifoin_pop(); + int16_t a = fifoin_pop(); float s = tsin(a); float c = tcos(a); float t1, t2; @@ -456,7 +456,7 @@ TGP_FUNCTION( model1_state::matrix_roty ) TGP_FUNCTION( model1_state::matrix_rotz ) { - INT16 a = fifoin_pop(); + int16_t a = fifoin_pop(); float s = tsin(a); float c = tcos(a); float t1, t2; @@ -479,8 +479,8 @@ TGP_FUNCTION( model1_state::matrix_rotz ) TGP_FUNCTION( model1_state::track_read_quad ) { - const UINT32 *tgp_data = (const UINT32 *)memregion("user2")->base(); - UINT32 a = fifoin_pop(); + const uint32_t *tgp_data = (const uint32_t *)memregion("user2")->base(); + uint32_t a = fifoin_pop(); int offd; logerror("TGP track_read_quad %d (%x)\n", a, m_pushpc); @@ -503,7 +503,7 @@ TGP_FUNCTION( model1_state::track_read_quad ) TGP_FUNCTION( model1_state::intercept ) { - const UINT32 *tgp_data = (const UINT32 *)memregion("user2")->base(); + const uint32_t *tgp_data = (const uint32_t *)memregion("user2")->base(); float x1 = fifoin_pop_f(); float y1 = fifoin_pop_f(); @@ -511,7 +511,7 @@ TGP_FUNCTION( model1_state::intercept ) float x2 = fifoin_pop_f(); float y2 = fifoin_pop_f(); float z2 = fifoin_pop_f(); - UINT32 idx = fifoin_pop(); + uint32_t idx = fifoin_pop(); logerror("TGP intercept %f, %f, %f, %f, %f, %f, %x (%x)\n", x1, y1, z1, x2, y2, z2, idx, m_pushpc); @@ -520,9 +520,9 @@ TGP_FUNCTION( model1_state::intercept ) float dz = z2-z1; idx = tgp_data[0x10] + 2*idx; - UINT32 count = tgp_data[idx]; - UINT32 adr = tgp_data[idx+1]; - UINT32 ret = 1; + uint32_t count = tgp_data[idx]; + uint32_t adr = tgp_data[idx+1]; + uint32_t ret = 1; for(unsigned int j=0; j<count; j++) { float point[4][3]; @@ -586,7 +586,7 @@ TGP_FUNCTION( model1_state::transform_point ) TGP_FUNCTION( model1_state::fcos_m1 ) { - INT16 a = fifoin_pop(); + int16_t a = fifoin_pop(); logerror("TGP fcos %d (%x)\n", a, m_pushpc); fifoout_push_f(tcos(a)); next_fn(); @@ -594,7 +594,7 @@ TGP_FUNCTION( model1_state::fcos_m1 ) TGP_FUNCTION( model1_state::fsin_m1 ) { - INT16 a = fifoin_pop(); + int16_t a = fifoin_pop(); logerror("TGP fsin %d (%x)\n", a, m_pushpc); fifoout_push_f(tsin(a)); next_fn(); @@ -602,7 +602,7 @@ TGP_FUNCTION( model1_state::fsin_m1 ) TGP_FUNCTION( model1_state::fcosm_m1 ) { - INT16 a = fifoin_pop(); + int16_t a = fifoin_pop(); float b = fifoin_pop_f(); logerror("TGP fcosm %d, %f (%x)\n", a, b, m_pushpc); fifoout_push_f(b*tcos(a)); @@ -611,7 +611,7 @@ TGP_FUNCTION( model1_state::fcosm_m1 ) TGP_FUNCTION( model1_state::fsinm_m1 ) { - INT16 a = fifoin_pop(); + int16_t a = fifoin_pop(); float b = fifoin_pop_f(); m_dump = true; logerror("TGP fsinm %d, %f (%x)\n", a, b, m_pushpc); @@ -645,7 +645,7 @@ TGP_FUNCTION( model1_state::ftoi ) TGP_FUNCTION( model1_state::itof ) { - INT32 a = fifoin_pop(); + int32_t a = fifoin_pop(); logerror("TGP itof %d (%x)\n", a, m_pushpc); fifoout_push_f(a); next_fn(); @@ -733,14 +733,14 @@ TGP_FUNCTION( model1_state::xyz2rqf ) if(a>=0) fifoout_push(0); else - fifoout_push((UINT32)-32768); + fifoout_push((uint32_t)-32768); } else if(!a) { if(c>=0) fifoout_push(16384); else - fifoout_push((UINT32)-16384); + fifoout_push((uint32_t)-16384); } else - fifoout_push((INT16)(atan2(c, a)*32768/M_PI)); + fifoout_push((int16_t)(atan2(c, a)*32768/M_PI)); if(!b) fifoout_push(0); @@ -748,9 +748,9 @@ TGP_FUNCTION( model1_state::xyz2rqf ) if(b>=0) fifoout_push(16384); else - fifoout_push((UINT32)-16384); + fifoout_push((uint32_t)-16384); } else - fifoout_push((INT16)(atan2(b, norm)*32768/M_PI)); + fifoout_push((int16_t)(atan2(b, norm)*32768/M_PI)); next_fn(); } @@ -794,8 +794,8 @@ TGP_FUNCTION( model1_state::f43_swa ) TGP_FUNCTION( model1_state::track_read_tri ) { - const UINT32 *tgp_data = (const UINT32 *)memregion("user2")->base(); - UINT32 a = fifoin_pop(); + const uint32_t *tgp_data = (const uint32_t *)memregion("user2")->base(); + uint32_t a = fifoin_pop(); int offd; logerror("TGP track_read_tri %d (%x)\n", a, m_pushpc); @@ -892,8 +892,8 @@ TGP_FUNCTION( model1_state::f47 ) TGP_FUNCTION( model1_state::track_read_info ) { - const UINT32 *tgp_data = (const UINT32 *)memregion("user2")->base(); - UINT16 a = fifoin_pop(); + const uint32_t *tgp_data = (const uint32_t *)memregion("user2")->base(); + uint16_t a = fifoin_pop(); int offd; logerror("TGP track_read_info %d (%x)\n", a, m_pushpc); @@ -1039,15 +1039,15 @@ static void tri_calc_pq(float ax, float ay, float bx, float by, float cx, float TGP_FUNCTION( model1_state::track_lookup ) { - const UINT32 *tgp_data = (const UINT32 *)memregion("user2")->base(); + const uint32_t *tgp_data = (const uint32_t *)memregion("user2")->base(); float a = fifoin_pop_f(); - UINT32 b = fifoin_pop(); + uint32_t b = fifoin_pop(); float c = fifoin_pop_f(); float d = fifoin_pop_f(); int offi, offd, len; float dist; int i; - UINT32 entry; + uint32_t entry; float height; logerror("TGP track_lookup %f, 0x%x, %f, %f (%x)\n", a, b, c, d, m_pushpc); @@ -1103,7 +1103,7 @@ TGP_FUNCTION( model1_state::f56 ) float d = fifoin_pop_f(); float e = fifoin_pop_f(); float f = fifoin_pop_f(); - UINT32 g = fifoin_pop(); + uint32_t g = fifoin_pop(); (void)a; (void)b; (void)c; @@ -1119,7 +1119,7 @@ TGP_FUNCTION( model1_state::f56 ) TGP_FUNCTION( model1_state::int_normal ) { - const UINT32 *tgp_data = (const UINT32 *)memregion("user2")->base(); + const uint32_t *tgp_data = (const uint32_t *)memregion("user2")->base(); logerror("TGP int_normal (%x)\n", m_pushpc); fifoout_push_f(u2f(tgp_data[m_tgp_int_adr+12])); fifoout_push_f(u2f(tgp_data[m_tgp_int_adr+13])); @@ -1239,7 +1239,7 @@ TGP_FUNCTION( model1_state::distance ) TGP_FUNCTION( model1_state::car_move ) { - INT16 a = fifoin_pop(); + int16_t a = fifoin_pop(); float b = fifoin_pop_f(); float c = fifoin_pop_f(); float d = fifoin_pop_f(); @@ -1302,7 +1302,7 @@ TGP_FUNCTION( model1_state::cpa ) TGP_FUNCTION( model1_state::vmat_store ) { - UINT32 a = fifoin_pop(); + uint32_t a = fifoin_pop(); if(a<21) memcpy(m_mat_vector[a], m_cmat, sizeof(m_cmat)); else @@ -1313,7 +1313,7 @@ TGP_FUNCTION( model1_state::vmat_store ) TGP_FUNCTION( model1_state::vmat_restore ) { - UINT32 a = fifoin_pop(); + uint32_t a = fifoin_pop(); if(a<21) memcpy(m_cmat, m_mat_vector[a], sizeof(m_cmat)); else @@ -1324,8 +1324,8 @@ TGP_FUNCTION( model1_state::vmat_restore ) TGP_FUNCTION( model1_state::vmat_mul ) { - UINT32 a = fifoin_pop(); - UINT32 b = fifoin_pop(); + uint32_t a = fifoin_pop(); + uint32_t b = fifoin_pop(); if(a<21 && b<21) { m_mat_vector[b][0] = m_mat_vector[a][ 0]*m_cmat[0] + m_mat_vector[a][ 1]*m_cmat[3] + m_mat_vector[a][ 2]*m_cmat[6]; m_mat_vector[b][1] = m_mat_vector[a][ 0]*m_cmat[1] + m_mat_vector[a][ 1]*m_cmat[4] + m_mat_vector[a][ 2]*m_cmat[7]; @@ -1347,7 +1347,7 @@ TGP_FUNCTION( model1_state::vmat_mul ) TGP_FUNCTION( model1_state::vmat_read ) { - UINT32 a = fifoin_pop(); + uint32_t a = fifoin_pop(); logerror("TGP vmat_read %d (%x)\n", a, m_pushpc); if(a<21) { int i; @@ -1390,7 +1390,7 @@ TGP_FUNCTION( model1_state::f80 ) TGP_FUNCTION( model1_state::vmat_save ) { - UINT32 a = fifoin_pop(); + uint32_t a = fifoin_pop(); int i; logerror("TGP vmat_save 0x%x (%x)\n", a, m_pushpc); for(i=0; i<16; i++) @@ -1400,7 +1400,7 @@ TGP_FUNCTION( model1_state::vmat_save ) TGP_FUNCTION( model1_state::vmat_load ) { - UINT32 a = fifoin_pop(); + uint32_t a = fifoin_pop(); int i; logerror("TGP vmat_load 0x%x (%x)\n", a, m_pushpc); for(i=0; i<16; i++) @@ -1440,10 +1440,10 @@ TGP_FUNCTION( model1_state::groundbox_test ) TGP_FUNCTION( model1_state::f89 ) { - UINT32 a = fifoin_pop(); - UINT32 b = fifoin_pop(); - UINT32 c = fifoin_pop(); - UINT32 d = fifoin_pop(); + uint32_t a = fifoin_pop(); + uint32_t b = fifoin_pop(); + uint32_t c = fifoin_pop(); + uint32_t d = fifoin_pop(); (void)a; (void)b; (void)c; @@ -1476,7 +1476,7 @@ TGP_FUNCTION( model1_state::f93 ) TGP_FUNCTION( model1_state::f94 ) { - UINT32 a = fifoin_pop(); + uint32_t a = fifoin_pop(); (void)a; logerror("TGP f94 %d (%x)\n", a, m_pushpc); next_fn(); @@ -1510,7 +1510,7 @@ TGP_FUNCTION( model1_state::vmat_flatten ) TGP_FUNCTION( model1_state::vmat_load1 ) { - UINT32 a = fifoin_pop(); + uint32_t a = fifoin_pop(); logerror("TGP vmat_load1 0x%x (%x)\n", a, m_pushpc); memcpy(m_cmat, m_ram_data.get()+a, sizeof(m_cmat)); next_fn(); @@ -1541,7 +1541,7 @@ TGP_FUNCTION( model1_state::f98_load ) TGP_FUNCTION( model1_state::f98 ) { - UINT32 a = fifoin_pop(); + uint32_t a = fifoin_pop(); (void)a; logerror("TGP load list start %d (%x)\n", a, m_pushpc); m_fifoin_cbcount = m_list_length; @@ -1592,9 +1592,9 @@ TGP_FUNCTION( model1_state::f102 ) float c = fifoin_pop_f(); float d = fifoin_pop_f(); float e = fifoin_pop_f(); - UINT32 f = fifoin_pop(); - UINT32 g = fifoin_pop(); - UINT32 h = fifoin_pop(); + uint32_t f = fifoin_pop(); + uint32_t g = fifoin_pop(); + uint32_t h = fifoin_pop(); m_ccount++; @@ -1846,7 +1846,7 @@ TGP_FUNCTION( model1_state::dump ) TGP_FUNCTION( model1_state::function_get_vf ) { - UINT32 f = fifoin_pop() >> 23; + uint32_t f = fifoin_pop() >> 23; if(m_fifoout_rpos != m_fifoout_wpos) { int count = m_fifoout_wpos - m_fifoout_rpos; @@ -1869,7 +1869,7 @@ TGP_FUNCTION( model1_state::function_get_vf ) TGP_FUNCTION( model1_state::function_get_swa ) { - UINT32 f = fifoin_pop(); + uint32_t f = fifoin_pop(); if(m_fifoout_rpos != m_fifoout_wpos) { int count = m_fifoout_wpos - m_fifoout_rpos; @@ -1932,7 +1932,7 @@ WRITE16_MEMBER(model1_state::model1_tgp_copro_ram_w) { COMBINE_DATA(m_ram_latch+offset); if(offset) { - UINT32 v = m_ram_latch[0]|(m_ram_latch[1]<<16); + uint32_t v = m_ram_latch[0]|(m_ram_latch[1]<<16); logerror("TGP f0 ram write %04x, %08x (%f) (%x)\n", m_ram_adr, v, u2f(v), space.device().safe_pc()); m_ram_data[m_ram_adr] = v; m_ram_adr++; @@ -1941,7 +1941,7 @@ WRITE16_MEMBER(model1_state::model1_tgp_copro_ram_w) MACHINE_START_MEMBER(model1_state,model1) { - m_ram_data = std::make_unique<UINT32[]>(0x10000); + m_ram_data = std::make_unique<uint32_t[]>(0x10000); save_pointer(NAME(m_ram_data.get()), 0x10000); save_item(NAME(m_ram_adr)); @@ -2012,7 +2012,7 @@ READ_LINE_MEMBER(model1_state::copro_fifoin_pop_ok) READ32_MEMBER(model1_state::copro_fifoin_pop) { - UINT32 r = m_copro_fifoin_data[m_copro_fifoin_rpos++]; + uint32_t r = m_copro_fifoin_data[m_copro_fifoin_rpos++]; if (m_copro_fifoin_rpos == FIFO_SIZE) { @@ -2025,7 +2025,7 @@ READ32_MEMBER(model1_state::copro_fifoin_pop) } -void model1_state::copro_fifoin_push(UINT32 data) +void model1_state::copro_fifoin_push(uint32_t data) { if (m_copro_fifoin_num == FIFO_SIZE) { @@ -2042,7 +2042,7 @@ void model1_state::copro_fifoin_push(UINT32 data) m_copro_fifoin_num++; } -UINT32 model1_state::copro_fifoout_pop() +uint32_t model1_state::copro_fifoout_pop() { if (m_copro_fifoout_num == 0) { @@ -2054,7 +2054,7 @@ UINT32 model1_state::copro_fifoout_pop() return 0; } - UINT32 r = m_copro_fifoout_data[m_copro_fifoout_rpos++]; + uint32_t r = m_copro_fifoout_data[m_copro_fifoout_rpos++]; if (m_copro_fifoout_rpos == FIFO_SIZE) { @@ -2111,7 +2111,7 @@ WRITE16_MEMBER(model1_state::model1_tgp_vr_adr_w) READ16_MEMBER(model1_state::model1_vr_tgp_ram_r) { - UINT16 r; + uint16_t r; if (!offset) { @@ -2140,7 +2140,7 @@ WRITE16_MEMBER(model1_state::model1_vr_tgp_ram_w) if (offset) { - UINT32 v = m_ram_latch[0]|(m_ram_latch[1]<<16); + uint32_t v = m_ram_latch[0]|(m_ram_latch[1]<<16); m_ram_data[m_ram_adr&0x7fff] = v; if ( m_ram_adr & 0x8000 ) m_ram_adr++; |