diff --git a/src/emu/cpu/alph8201/8201dasm.c b/src/emu/cpu/alph8201/8201dasm.c
index dcfed7345a0..8b3b6d96a37 100644
--- a/src/emu/cpu/alph8201/8201dasm.c
+++ b/src/emu/cpu/alph8201/8201dasm.c
@@ -257,7 +257,7 @@ static const char *const Formats[] = {
 	NULL
 };
 
-#define MAX_OPS (((sizeof(Formats) / sizeof(Formats[0])) - 1) / PTRS_PER_FORMAT)
+#define MAX_OPS ((ARRAY_LENGTH(Formats) - 1) / PTRS_PER_FORMAT)
 
 struct AD8201Opcode {
 	byte mask;
diff --git a/src/emu/cpu/m6809/6309dasm.c b/src/emu/cpu/m6809/6309dasm.c
index 716dc59c525..be7913053a0 100644
--- a/src/emu/cpu/m6809/6309dasm.c
+++ b/src/emu/cpu/m6809/6309dasm.c
@@ -582,9 +582,9 @@ static const opcodeinfo *const hd6309_pgpointers[3] =
 
 static const int hd6309_numops[3] =
 {
-	sizeof(hd6309_pg0opcodes) / sizeof(hd6309_pg0opcodes[0]),
-	sizeof(hd6309_pg1opcodes) / sizeof(hd6309_pg1opcodes[0]),
-	sizeof(hd6309_pg2opcodes) / sizeof(hd6309_pg2opcodes[0])
+	ARRAY_LENGTH(hd6309_pg0opcodes),
+	ARRAY_LENGTH(hd6309_pg1opcodes),
+	ARRAY_LENGTH(hd6309_pg2opcodes)
 };
 
 static const char *const hd6309_regs[5] = { "X", "Y", "U", "S", "PC" };
diff --git a/src/emu/cpu/m6809/6809dasm.c b/src/emu/cpu/m6809/6809dasm.c
index 95053b8b66f..37d04c45631 100644
--- a/src/emu/cpu/m6809/6809dasm.c
+++ b/src/emu/cpu/m6809/6809dasm.c
@@ -351,9 +351,9 @@ static const opcodeinfo *const m6809_pgpointers[3] =
 
 static const int m6809_numops[3] =
 {
-	sizeof(m6809_pg0opcodes) / sizeof(m6809_pg0opcodes[0]),
-	sizeof(m6809_pg1opcodes) / sizeof(m6809_pg1opcodes[0]),
-	sizeof(m6809_pg2opcodes) / sizeof(m6809_pg2opcodes[0])
+	ARRAY_LENGTH(m6809_pg0opcodes),
+	ARRAY_LENGTH(m6809_pg1opcodes),
+	ARRAY_LENGTH(m6809_pg2opcodes)
 };
 
 static const char *const m6809_regs[5] = { "X", "Y", "U", "S", "PC" };
diff --git a/src/emu/cpu/pic16c5x/16c5xdsm.c b/src/emu/cpu/pic16c5x/16c5xdsm.c
index 7a319b470c2..146bb0cf9a3 100644
--- a/src/emu/cpu/pic16c5x/16c5xdsm.c
+++ b/src/emu/cpu/pic16c5x/16c5xdsm.c
@@ -84,7 +84,7 @@ static const char *const PIC16C5xFormats[] = {
 	NULL
 };
 
-#define MAX_OPS (((sizeof(PIC16C5xFormats) / sizeof(PIC16C5xFormats[0])) - 1) / PTRS_PER_FORMAT)
+#define MAX_OPS ((ARRAY_LENGTH(PIC16C5xFormats) - 1) / PTRS_PER_FORMAT)
 
 struct PIC16C5xOpcode  {
 	word mask;          /* instruction mask */
diff --git a/src/emu/cpu/pic16c62x/16c62xdsm.c b/src/emu/cpu/pic16c62x/16c62xdsm.c
index 2d2ec4e1b44..5fe1f147b8e 100644
--- a/src/emu/cpu/pic16c62x/16c62xdsm.c
+++ b/src/emu/cpu/pic16c62x/16c62xdsm.c
@@ -94,7 +94,7 @@ static const char *const PIC16C62xFormats[] = {
 	NULL
 };
 
-#define MAX_OPS (((sizeof(PIC16C62xFormats) / sizeof(PIC16C62xFormats[0])) - 1) / PTRS_PER_FORMAT)
+#define MAX_OPS ((ARRAY_LENGTH(PIC16C62xFormats) - 1) / PTRS_PER_FORMAT)
 
 struct PIC16C62xOpcode  {
 	word mask;          /* instruction mask */
diff --git a/src/emu/cpu/tlcs90/tlcs90.c b/src/emu/cpu/tlcs90/tlcs90.c
index 964b3a5f350..9f9ee34383f 100644
--- a/src/emu/cpu/tlcs90/tlcs90.c
+++ b/src/emu/cpu/tlcs90/tlcs90.c
@@ -975,7 +975,7 @@ static const char *const ir_names[] =   {
 const char *tlcs90_device::internal_registers_names(UINT16 x)
 {
 	int ir = x - T90_IOBASE;
-	if ( ir >= 0 && ir < sizeof(ir_names)/sizeof(ir_names[0]) )
+	if ( ir >= 0 && ir < ARRAY_LENGTH(ir_names) )
 		return ir_names[ir];
 	return NULL;
 }
diff --git a/src/emu/cpu/tms32010/32010dsm.c b/src/emu/cpu/tms32010/32010dsm.c
index ddbba79eedc..886d07bc97e 100644
--- a/src/emu/cpu/tms32010/32010dsm.c
+++ b/src/emu/cpu/tms32010/32010dsm.c
@@ -154,7 +154,7 @@ static const char *const TMS32010Formats[] = {
 	NULL
 };
 
-#define MAX_OPS (((sizeof(TMS32010Formats) / sizeof(TMS32010Formats[0])) - 1) / PTRS_PER_FORMAT)
+#define MAX_OPS ((ARRAY_LENGTH(TMS32010Formats) - 1) / PTRS_PER_FORMAT)
 
 struct TMS32010Opcode  {
 	word mask;          /* instruction mask */
diff --git a/src/emu/cpu/tms32025/32025dsm.c b/src/emu/cpu/tms32025/32025dsm.c
index b0b005f3b8d..9d7482cd20e 100644
--- a/src/emu/cpu/tms32025/32025dsm.c
+++ b/src/emu/cpu/tms32025/32025dsm.c
@@ -314,7 +314,7 @@ static const char *const TMS32025Formats[] = {
 	NULL
 };
 
-#define MAX_OPS (((sizeof(TMS32025Formats) / sizeof(TMS32025Formats[0])) - 1) / PTRS_PER_FORMAT)
+#define MAX_OPS ((ARRAY_LENGTH(TMS32025Formats) - 1) / PTRS_PER_FORMAT)
 
 struct TMS32025Opcode  {
 	word mask;          /* instruction mask */
diff --git a/src/emu/debug/debughlp.c b/src/emu/debug/debughlp.c
index 1a06b2cc30a..65dd2a2c161 100644
--- a/src/emu/debug/debughlp.c
+++ b/src/emu/debug/debughlp.c
@@ -1481,7 +1481,7 @@ const char *debug_get_help(const char *tag)
 		tagcopy[i] = tolower((UINT8)tag[i]);
 
 	/* find a match */
-	for (i = 0; i < sizeof(static_help_list) / sizeof(static_help_list[0]); i++)
+	for (i = 0; i < ARRAY_LENGTH(static_help_list); i++)
 		if (!strncmp(static_help_list[i].tag, tagcopy, taglen))
 		{
 			foundcount++;
@@ -1503,7 +1503,7 @@ const char *debug_get_help(const char *tag)
 
 	/* otherwise, indicate ambiguous help */
 	msglen = sprintf(ambig_message, "Ambiguous help request, did you mean:\n");
-	for (i = 0; i < sizeof(static_help_list) / sizeof(static_help_list[0]); i++)
+	for (i = 0; i < ARRAY_LENGTH(static_help_list); i++)
 		if (!strncmp(static_help_list[i].tag, tagcopy, taglen))
 			msglen += sprintf(&ambig_message[msglen], "  help %s?\n", static_help_list[i].tag);
 	return ambig_message;
diff --git a/src/emu/machine/53c810.c b/src/emu/machine/53c810.c
index 261130e3233..a3570b28f8c 100644
--- a/src/emu/machine/53c810.c
+++ b/src/emu/machine/53c810.c
@@ -759,7 +759,7 @@ unsigned lsi53c810_device::lsi53c810_dasm(char *buf, UINT32 pc)
 		buf += sprintf(buf, "%s ", op_mnemonic);
 		need_cojunction = FALSE;
 
-		for (i = 0; i < sizeof(flags) / sizeof(flags[0]); i++)
+		for (i = 0; i < ARRAY_LENGTH(flags); i++)
 		{
 			if (op & flags[i].flag)
 			{
diff --git a/src/emu/machine/6526cia.c b/src/emu/machine/6526cia.c
index 7794b0b62e7..c27c5387553 100644
--- a/src/emu/machine/6526cia.c
+++ b/src/emu/machine/6526cia.c
@@ -169,7 +169,7 @@ void legacy_mos6526_device::device_start()
 	m_flag = 1;
 
 	/* setup ports */
-	for (int p = 0; p < (sizeof(m_port) / sizeof(m_port[0])); p++)
+	for (int p = 0; p < ARRAY_LENGTH(m_port); p++)
 	{
 		m_port[p].m_mask_value = 0xff;
 	}
@@ -177,7 +177,7 @@ void legacy_mos6526_device::device_start()
 	/* setup timers */
 	m_pc_timer = timer_alloc(TIMER_PC);
 
-	for (int t = 0; t < (sizeof(m_timer) / sizeof(m_timer[0])); t++)
+	for (int t = 0; t < ARRAY_LENGTH(m_timer); t++)
 	{
 		cia_timer *timer = &m_timer[t];
 		timer->m_timer = machine().scheduler().timer_alloc(FUNC(timer_proc), (void*)this);
diff --git a/src/emu/machine/nscsi_bus.c b/src/emu/machine/nscsi_bus.c
index efeb4c8585c..7d90e373500 100644
--- a/src/emu/machine/nscsi_bus.c
+++ b/src/emu/machine/nscsi_bus.c
@@ -447,7 +447,7 @@ bool nscsi_full_device::command_done()
 
 nscsi_full_device::control *nscsi_full_device::buf_control_push()
 {
-	if(buf_control_wpos == int(sizeof(buf_control)/sizeof(buf_control[0])))
+	if(buf_control_wpos == int(ARRAY_LENGTH(buf_control)))
 		throw emu_fatalerror("%s: buf_control overflow\n", tag());
 
 	control *c = buf_control + buf_control_wpos;
diff --git a/src/emu/machine/pckeybrd.c b/src/emu/machine/pckeybrd.c
index d41e7a12ed3..3801c6a20ff 100644
--- a/src/emu/machine/pckeybrd.c
+++ b/src/emu/machine/pckeybrd.c
@@ -393,7 +393,7 @@ void pc_keyboard_device::queue_insert(UINT8 data)
 
 	m_queue[m_head] = data;
 	m_head++;
-	m_head %= (sizeof(m_queue) / sizeof(m_queue[0]));
+	m_head %= ARRAY_LENGTH(m_queue);
 }
 
 
@@ -402,7 +402,7 @@ int pc_keyboard_device::queue_size(void)
 	int queue_size;
 	queue_size = m_head - m_tail;
 	if (queue_size < 0)
-		queue_size += sizeof(m_queue) / sizeof(m_queue[0]);
+		queue_size += ARRAY_LENGTH(m_queue);
 	return queue_size;
 }
 
@@ -669,7 +669,7 @@ READ8_MEMBER(pc_keyboard_device::read)
 		logerror("read(): Keyboard Read 0x%02x\n",data);
 
 	m_tail++;
-	m_tail %= sizeof(m_queue) / sizeof(m_queue[0]);
+	m_tail %= ARRAY_LENGTH(m_queue);
 	return data;
 }
 
diff --git a/src/emu/memory.c b/src/emu/memory.c
index ac5a29068d9..5d40d7a0cee 100644
--- a/src/emu/memory.c
+++ b/src/emu/memory.c
@@ -2901,7 +2901,7 @@ address_table::address_table(address_space &space, bool large)
 {
 	// make our static table all watchpoints
 	if (s_watchpoint_table[0] != STATIC_WATCHPOINT)
-		for (unsigned int i=0; i != sizeof(s_watchpoint_table)/sizeof(s_watchpoint_table[0]); i++)
+		for (unsigned int i=0; i != ARRAY_LENGTH(s_watchpoint_table); i++)
 			s_watchpoint_table[i] = STATIC_WATCHPOINT;
 
 	// initialize everything to unmapped
diff --git a/src/emu/sound/spu_tables.c b/src/emu/sound/spu_tables.c
index e541d20365b..c2c4889e349 100644
--- a/src/emu/sound/spu_tables.c
+++ b/src/emu/sound/spu_tables.c
@@ -123,7 +123,7 @@ static float linear_rate[]=
 	s_to_rate(6080.0f)
 };
 
-static const int num_linear_rates=sizeof(linear_rate)/sizeof(linear_rate[0]);
+static const int num_linear_rates=ARRAY_LENGTH(linear_rate);
 
 static const float pos_exp_rate[]=
 {
@@ -229,7 +229,7 @@ static const float pos_exp_rate[]=
 	s_to_rate(2664.0f)
 };
 
-static const int num_pos_exp_rates=sizeof(linear_rate)/sizeof(linear_rate[0]);
+static const int num_pos_exp_rates=ARRAY_LENGTH(linear_rate);
 
 static const float neg_exp_rate[]=
 {
@@ -343,7 +343,7 @@ static const float neg_exp_rate[]=
 	s_to_rate(11200.0f)
 };
 
-static const int num_neg_exp_rates=sizeof(linear_rate)/sizeof(linear_rate[0]);
+static const int num_neg_exp_rates=ARRAY_LENGTH(linear_rate);
 
 static const float decay_rate[16]=
 {
@@ -396,7 +396,7 @@ static const float linear_release_rate[]=
 	s_to_rate(3040.0f)
 };
 
-static const int num_linear_release_rates=sizeof(linear_release_rate)/sizeof(linear_release_rate[0]);
+static const int num_linear_release_rates=ARRAY_LENGTH(linear_release_rate);
 
 static const float exp_release_rate[]=
 {
@@ -429,7 +429,7 @@ static const float exp_release_rate[]=
 	s_to_rate(7008.0f)
 };
 
-static const int num_exp_release_rates=sizeof(exp_release_rate)/sizeof(exp_release_rate[0]);
+static const int num_exp_release_rates=ARRAY_LENGTH(exp_release_rate);
 
 //
 //
diff --git a/src/emu/video/mc6847.c b/src/emu/video/mc6847.c
index 4b08868e7c8..b1810cc3446 100644
--- a/src/emu/video/mc6847.c
+++ b/src/emu/video/mc6847.c
@@ -929,7 +929,7 @@ mc6847_friend_device::character_map::character_map(const UINT8 *text_fontdata, b
 	}
 
 	// loop through all modes
-	for (mode = 0; mode < sizeof(m_entries) / sizeof(m_entries[0]); mode++)
+	for (mode = 0; mode < ARRAY_LENGTH(m_entries); mode++)
 	{
 		const UINT8 *fontdata;
 		UINT8 character_mask;
diff --git a/src/emu/video/mc6847.h b/src/emu/video/mc6847.h
index 63f84873194..f93ca8dd338 100644
--- a/src/emu/video/mc6847.h
+++ b/src/emu/video/mc6847.h
@@ -151,7 +151,7 @@ protected:
 				UINT8 character = data[i];
 
 				// based on the mode, determine which entry to use
-				const entry *e = &m_entries[mode % (sizeof(m_entries) / sizeof(m_entries[0]))];
+				const entry *e = &m_entries[mode % ARRAY_LENGTH(m_entries)];
 
 				// identify the character in the font data
 				const UINT8 *font_character = e->m_fontdata + (character & e->m_character_mask) * 12;
diff --git a/src/mame/drivers/famibox.c b/src/mame/drivers/famibox.c
index a30743422f5..dbf96a36298 100644
--- a/src/mame/drivers/famibox.c
+++ b/src/mame/drivers/famibox.c
@@ -272,7 +272,7 @@ void famibox_state::famicombox_bankswitch(UINT8 bank)
 	};
 
 
-	for (int i = 0; i < sizeof(famicombox_banks)/sizeof(famicombox_banks[0]); i++ )
+	for (int i = 0; i < ARRAY_LENGTH(famicombox_banks); i++ )
 	{
 		if ( bank == famicombox_banks[i].bank ||
 				famicombox_banks[i].bank == 0 )
diff --git a/src/mame/drivers/jalmah.c b/src/mame/drivers/jalmah.c
index 4a0d5805b87..6c378a76c14 100644
--- a/src/mame/drivers/jalmah.c
+++ b/src/mame/drivers/jalmah.c
@@ -1762,7 +1762,7 @@ READ16_MEMBER(jalmah_state::urashima_mcu_r)
 	int res;
 
 	res = resp[m_respcount++];
-	if (m_respcount >= sizeof(resp)/sizeof(resp[0])) m_respcount = 0;
+	if (m_respcount >= ARRAY_LENGTH(resp)) m_respcount = 0;
 
 //  logerror("%04x: mcu_r %02x\n",space.device().safe_pc(),res);
 
@@ -1980,7 +1980,7 @@ READ16_MEMBER(jalmah_state::daireika_mcu_r)
 	int res;
 
 	res = resp[m_respcount++];
-	if (m_respcount >= sizeof(resp)/sizeof(resp[0])) m_respcount = 0;
+	if (m_respcount >= ARRAY_LENGTH(resp)) m_respcount = 0;
 
 //  logerror("%04x: mcu_r %02x\n",space.device().safe_pc(),res);
 
@@ -2259,7 +2259,7 @@ READ16_MEMBER(jalmah_state::mjzoomin_mcu_r)
 	int res;
 
 	res = resp[m_respcount++];
-	if (m_respcount >= sizeof(resp)/sizeof(resp[0])) m_respcount = 0;
+	if (m_respcount >= ARRAY_LENGTH(resp)) m_respcount = 0;
 
 //  logerror("%04x: mcu_r %02x\n",space.device().safe_pc(),res);
 
@@ -2396,7 +2396,7 @@ READ16_MEMBER(jalmah_state::kakumei_mcu_r)
 	int res;
 
 	res = resp[m_respcount++];
-	if (m_respcount >= sizeof(resp)/sizeof(resp[0])) m_respcount = 0;
+	if (m_respcount >= ARRAY_LENGTH(resp)) m_respcount = 0;
 
 //  popmessage("%04x: mcu_r %02x",space.device().safe_pc(),res);
 
@@ -2417,7 +2417,7 @@ READ16_MEMBER(jalmah_state::suchipi_mcu_r)
 	int res;
 
 	res = resp[m_respcount++];
-	if (m_respcount >= sizeof(resp)/sizeof(resp[0])) m_respcount = 0;
+	if (m_respcount >= ARRAY_LENGTH(resp)) m_respcount = 0;
 
 //  popmessage("%04x: mcu_r %02x",space.device().safe_pc(),res);
 
diff --git a/src/mame/drivers/psikyosh.c b/src/mame/drivers/psikyosh.c
index aa65c90760a..ba613bf40d8 100644
--- a/src/mame/drivers/psikyosh.c
+++ b/src/mame/drivers/psikyosh.c
@@ -464,12 +464,12 @@ P1KEY11  29|30  P2KEY11
 
 		// HACK: read IPT_START1 from "INPUTS" to avoid listing it twice or having two independent STARTs listed
 		int start_depressed = ~value & 0x01000000;
-		keys |= start_depressed ? 1 << (sizeof(key_codes)/sizeof(key_codes[0]) - 1) : 0; // and bung it in at the end
+		keys |= start_depressed ? 1 << (ARRAY_LENGTH(key_codes) - 1) : 0; // and bung it in at the end
 
 		value |= 0xFFFF0000; // set top word
 		do {
 			// since we can't handle multiple keys, just return the first one depressed
-			if((keys & which_key) && (count < sizeof(key_codes)/sizeof(key_codes[0]))) {
+			if((keys & which_key) && (count < ARRAY_LENGTH(key_codes))) {
 				value &= ~((UINT32)(key_codes[count]) << 16); // mask in selected word as IP_ACTIVE_LOW
 				break;
 			}
diff --git a/src/mame/drivers/skydiver.c b/src/mame/drivers/skydiver.c
index 2a1cef14149..98a8be7a4c2 100644
--- a/src/mame/drivers/skydiver.c
+++ b/src/mame/drivers/skydiver.c
@@ -116,7 +116,7 @@ PALETTE_INIT_MEMBER(skydiver_state, skydiver)
 {
 	int i;
 
-	for (i = 0; i < sizeof(colortable_source) / sizeof(colortable_source[0]); i++)
+	for (i = 0; i < ARRAY_LENGTH(colortable_source); i++)
 	{
 		rgb_t color;
 
@@ -389,7 +389,7 @@ static MACHINE_CONFIG_START( skydiver, skydiver_state )
 	MCFG_SCREEN_PALETTE("palette")
 
 	MCFG_GFXDECODE_ADD("gfxdecode", "palette", skydiver)
-	MCFG_PALETTE_ADD("palette", sizeof(colortable_source) / sizeof(colortable_source[0]))
+	MCFG_PALETTE_ADD("palette", ARRAY_LENGTH(colortable_source))
 	MCFG_PALETTE_INIT_OWNER(skydiver_state, skydiver)
 
 
diff --git a/src/mame/drivers/snowbros.c b/src/mame/drivers/snowbros.c
index bc17398e7e6..1b1f026b530 100644
--- a/src/mame/drivers/snowbros.c
+++ b/src/mame/drivers/snowbros.c
@@ -2394,7 +2394,7 @@ DRIVER_INIT_MEMBER(snowbros_state,cookbib2)
 
 
 
-//for (i = 0;i < sizeof(cookbib2_mcu68k)/sizeof(cookbib2_mcu68k[0]);i++)
+//for (i = 0;i < ARRAY_LENGTH(cookbib2_mcu68k);i++)
 //      m_hyperpac_ram[0xf000/2 + i] = cookbib2_mcu68k[i];
 
 //  for (i = 0;i < 0x200/2;i++)
diff --git a/src/mame/drivers/spcforce.c b/src/mame/drivers/spcforce.c
index 7c851750802..a51c6dbc08b 100644
--- a/src/mame/drivers/spcforce.c
+++ b/src/mame/drivers/spcforce.c
@@ -242,7 +242,7 @@ PALETTE_INIT_MEMBER(spcforce_state, spcforce)
 {
 	int i;
 
-	for (i = 0; i < sizeof(colortable_source) / sizeof(colortable_source[0]); i++)
+	for (i = 0; i < ARRAY_LENGTH(colortable_source); i++)
 	{
 		int data = colortable_source[i];
 		rgb_t color = rgb_t(pal1bit(data >> 0), pal1bit(data >> 1), pal1bit(data >> 2));
@@ -280,7 +280,7 @@ static MACHINE_CONFIG_START( spcforce, spcforce_state )
 	MCFG_SCREEN_PALETTE("palette")
 
 	MCFG_GFXDECODE_ADD("gfxdecode", "palette", spcforce)
-	MCFG_PALETTE_ADD("palette", sizeof(colortable_source) / sizeof(colortable_source[0]))
+	MCFG_PALETTE_ADD("palette", ARRAY_LENGTH(colortable_source))
 	MCFG_PALETTE_INIT_OWNER(spcforce_state, spcforce)
 
 	/* sound hardware */
diff --git a/src/mame/video/lordgun.c b/src/mame/video/lordgun.c
index 396384bfeaa..48b8d292abd 100644
--- a/src/mame/video/lordgun.c
+++ b/src/mame/video/lordgun.c
@@ -174,7 +174,7 @@ float lordgun_crosshair_mapper(ioport_field *field, float linear_value)
 {
 	int x = linear_value - 0x3c;
 
-	if ( (x < 0) || (x > sizeof(lordgun_gun_x_table)/sizeof(lordgun_gun_x_table[0])) )
+	if ( (x < 0) || (x > ARRAY_LENGTH(lordgun_gun_x_table)) )
 		x = 0;
 
 	return lordgun_gun_x_table[x] * 1.0f / 0x1BF;
@@ -186,7 +186,7 @@ void lordgun_state::lorddgun_calc_gun_scr(int i)
 
 	int x = ioport(gunnames[i])->read() - 0x3c;
 
-	if ( (x < 0) || (x > sizeof(lordgun_gun_x_table)/sizeof(lordgun_gun_x_table[0])) )
+	if ( (x < 0) || (x > ARRAY_LENGTH(lordgun_gun_x_table)) )
 		x = 0;
 
 	m_gun[i].scr_x = lordgun_gun_x_table[x];
diff --git a/src/mame/video/starshp1.c b/src/mame/video/starshp1.c
index 51c3a5e49e3..752f21cb021 100644
--- a/src/mame/video/starshp1.c
+++ b/src/mame/video/starshp1.c
@@ -37,7 +37,7 @@ PALETTE_INIT_MEMBER(starshp1_state, starshp1)
 		5, 7        /* 0x11        - circle */
 	};
 
-	for (i = 0; i < sizeof(colortable_source) / sizeof(colortable_source[0]); i++)
+	for (i = 0; i < ARRAY_LENGTH(colortable_source); i++)
 		palette.set_pen_indirect(i, colortable_source[i]);
 }
 
diff --git a/src/mess/drivers/gmaster.c b/src/mess/drivers/gmaster.c
index bc7835b83cd..fab2dc587fb 100644
--- a/src/mess/drivers/gmaster.c
+++ b/src/mess/drivers/gmaster.c
@@ -300,7 +300,7 @@ static MACHINE_CONFIG_START( gmaster, gmaster_state )
 	MCFG_SCREEN_UPDATE_DRIVER(gmaster_state, screen_update_gmaster)
 	MCFG_SCREEN_PALETTE("palette")
 
-	MCFG_PALETTE_ADD("palette", sizeof(gmaster_palette)/sizeof(gmaster_palette[0]))
+	MCFG_PALETTE_ADD("palette", ARRAY_LENGTH(gmaster_palette))
 	MCFG_PALETTE_INIT_OWNER(gmaster_state, gmaster)
 	MCFG_DEFAULT_LAYOUT(layout_lcd)
 
diff --git a/src/mess/machine/6883sam.c b/src/mess/machine/6883sam.c
index 30306f3bcf3..165ada1fb71 100644
--- a/src/mess/machine/6883sam.c
+++ b/src/mess/machine/6883sam.c
@@ -142,7 +142,7 @@ void sam6883_device::configure_bank(int bank, read8_delegate rhandler, write8_de
 
 void sam6883_device::configure_bank(int bank, UINT8 *memory, UINT32 memory_size, bool is_read_only, read8_delegate rhandler, write8_delegate whandler)
 {
-	assert((bank >= 0) && (bank < sizeof(m_banks) / sizeof(m_banks[0])));
+	assert((bank >= 0) && (bank < ARRAY_LENGTH(m_banks)));
 	m_banks[bank].m_memory = memory;
 	m_banks[bank].m_memory_size = memory_size;
 	m_banks[bank].m_memory_read_only = is_read_only;
diff --git a/src/mess/machine/coco.c b/src/mess/machine/coco.c
index ee204254c81..8f19ac906f0 100644
--- a/src/mess/machine/coco.c
+++ b/src/mess/machine/coco.c
@@ -120,10 +120,10 @@ void coco_state::device_start()
 	driver_device::device_start();
 
 	/* look up keyboard ports */
-	for (int i = 0; i < sizeof(m_keyboard) / sizeof(m_keyboard[0]); i++)
+	for (int i = 0; i < ARRAY_LENGTH(m_keyboard); i++)
 	{
 		char name[32];
-		snprintf(name, sizeof(name) / sizeof(name[0]), "row%d", i);
+		snprintf(name, ARRAY_LENGTH(name), "row%d", i);
 		m_keyboard[i] =  ioport(name);
 	}
 
@@ -850,7 +850,7 @@ void coco_state::poll_keyboard(void)
 	UINT8 pia0_pa_z = 0x7F;
 
 	/* poll the keyboard, and update PA6-PA0 accordingly*/
-	for (int i = 0; i < sizeof(m_keyboard) / sizeof(m_keyboard[0]); i++)
+	for (int i = 0; i < ARRAY_LENGTH(m_keyboard); i++)
 	{
 		int value = m_keyboard[i]->read();
 		if ((value | pia0_pb) != 0xFF)
diff --git a/src/mess/tools/floptool/main.c b/src/mess/tools/floptool/main.c
index 15d3b904667..4a67ce8a940 100644
--- a/src/mess/tools/floptool/main.c
+++ b/src/mess/tools/floptool/main.c
@@ -70,7 +70,7 @@ void CLIB_DECL ATTR_PRINTF(1,2) logerror(const char *format, ...)
 	va_end(arg);
 }
 
-enum { FORMAT_COUNT = sizeof(floppy_formats)/sizeof(floppy_formats[0]) };
+enum { FORMAT_COUNT = ARRAY_LENGTH(floppy_formats) };
 
 static floppy_image_format_t *formats[FORMAT_COUNT];
 
diff --git a/src/mess/tools/imgtool/modules.c b/src/mess/tools/imgtool/modules.c
index b60fdb48cf4..374e5a7500e 100644
--- a/src/mess/tools/imgtool/modules.c
+++ b/src/mess/tools/imgtool/modules.c
@@ -49,8 +49,7 @@ imgtoolerr_t imgtool_create_cannonical_library(int omit_untested, imgtool_librar
 		imgtool_library_add(lib, modules[i]);
 
 	/* remove irrelevant modules */
-	for (i = 0; i < sizeof(irrelevant_modules)
-			/ sizeof(irrelevant_modules[0]); i++)
+	for (i = 0; i < ARRAY_LENGTH(irrelevant_modules); i++)
 	{
 		imgtool_library_unlink(lib, irrelevant_modules[i]);
 	}
diff --git a/src/mess/tools/imgtool/modules/ti99.c b/src/mess/tools/imgtool/modules/ti99.c
index 8e200d7db89..b53db8f44c9 100644
--- a/src/mess/tools/imgtool/modules/ti99.c
+++ b/src/mess/tools/imgtool/modules/ti99.c
@@ -1830,7 +1830,7 @@ static int dsk_read_catalog(struct ti99_lvl2_imgref *l2_img, int aphysrec, ti99_
 			|| ((dest->files[i].fdr_ptr && dest->files[i+1].fdr_ptr) && (memcmp(dest->files[i].name, dest->files[i+1].name, 10) >= 0)))
 		{
 			/* if the catalog is not sorted, we repair it */
-			qsort(dest->files, sizeof(dest->files)/sizeof(dest->files[0]), sizeof(dest->files[0]),
+			qsort(dest->files, ARRAY_LENGTH(dest->files), sizeof(dest->files[0]),
 					cat_file_compare_qsort);
 			break;
 		}
diff --git a/src/mess/video/stic.c b/src/mess/video/stic.c
index 2e0f572fc29..128b1278842 100644
--- a/src/mess/video/stic.c
+++ b/src/mess/video/stic.c
@@ -952,7 +952,7 @@ WRITE16_MEMBER( stic_device::write )
 			break;
 	}
 
-	if (offset < sizeof(m_stic_registers) / sizeof(m_stic_registers[0]))
+	if (offset < ARRAY_LENGTH(m_stic_registers))
 		m_stic_registers[offset] = data;
 }
 
diff --git a/src/tools/jedutil.c b/src/tools/jedutil.c
index c5f8233daea..eaae8df6b82 100644
--- a/src/tools/jedutil.c
+++ b/src/tools/jedutil.c
@@ -119,8 +119,6 @@
     CONSTANTS
 ***************************************************************************/
 
-#define ARRAY_LEN(_array) (sizeof(_array) / sizeof(_array[0]))
-
 #define NO_OUTPUT_ENABLE_FUSE_ROW 0xFFFF
 
 /* Output pin flags */
@@ -1873,93 +1871,93 @@ static pin_fuse_columns pal20l2pinfusecolumns[] = {
 
 static pal_data paldata[] = {
 	{"PAL10L8", 320,
-		pal10l8pinfuserows, ARRAY_LEN(pal10l8pinfuserows),
-		pal10l8pinfusecolumns, ARRAY_LEN(pal10l8pinfusecolumns),
+		pal10l8pinfuserows, ARRAY_LENGTH(pal10l8pinfuserows),
+		pal10l8pinfusecolumns, ARRAY_LENGTH(pal10l8pinfusecolumns),
 		print_pal10l8_product_terms,
 		config_pal10l8_pins,
 		NULL,
 		NULL},
 	{"PAL10H8", 320,
-		pal10h8pinfuserows, ARRAY_LEN(pal10h8pinfuserows),
-		pal10h8pinfusecolumns, ARRAY_LEN(pal10h8pinfusecolumns),
+		pal10h8pinfuserows, ARRAY_LENGTH(pal10h8pinfuserows),
+		pal10h8pinfusecolumns, ARRAY_LENGTH(pal10h8pinfusecolumns),
 		print_pal10h8_product_terms,
 		config_pal10h8_pins,
 		NULL,
 		NULL},
 	{"PAL12H6", 384,
-		pal12h6pinfuserows, ARRAY_LEN(pal12h6pinfuserows),
-		pal12h6pinfusecolumns, ARRAY_LEN(pal12h6pinfusecolumns),
+		pal12h6pinfuserows, ARRAY_LENGTH(pal12h6pinfuserows),
+		pal12h6pinfusecolumns, ARRAY_LENGTH(pal12h6pinfusecolumns),
 		print_pal12h6_product_terms,
 		config_pal12h6_pins,
 		NULL,
 		NULL},
 	{"PAL14H4", 448,
-		pal14h4pinfuserows, ARRAY_LEN(pal14h4pinfuserows),
-		pal14h4pinfusecolumns, ARRAY_LEN(pal14h4pinfusecolumns),
+		pal14h4pinfuserows, ARRAY_LENGTH(pal14h4pinfuserows),
+		pal14h4pinfusecolumns, ARRAY_LENGTH(pal14h4pinfusecolumns),
 		print_pal14h4_product_terms,
 		config_pal14h4_pins,
 		NULL,
 		NULL},
 	{"PAL16H2", 512,
-		pal16h2pinfuserows, ARRAY_LEN(pal16h2pinfuserows),
-		pal16h2pinfusecolumns, ARRAY_LEN(pal16h2pinfusecolumns),
+		pal16h2pinfuserows, ARRAY_LENGTH(pal16h2pinfuserows),
+		pal16h2pinfusecolumns, ARRAY_LENGTH(pal16h2pinfusecolumns),
 		print_pal16h2_product_terms,
 		config_pal16h2_pins,
 		NULL,
 		NULL},
 	{"PAL16C1", 512,
-		pal16c1pinfuserows, ARRAY_LEN(pal16c1pinfuserows),
-		pal16c1pinfusecolumns, ARRAY_LEN(pal16c1pinfusecolumns),
+		pal16c1pinfuserows, ARRAY_LENGTH(pal16c1pinfuserows),
+		pal16c1pinfusecolumns, ARRAY_LENGTH(pal16c1pinfusecolumns),
 		print_pal16c1_product_terms,
 		config_pal16c1_pins,
 		NULL,
 		NULL},
 	{"PAL12L6", 384,
-		pal12l6pinfuserows, ARRAY_LEN(pal12l6pinfuserows),
-		pal12l6pinfusecolumns, ARRAY_LEN(pal12l6pinfusecolumns),
+		pal12l6pinfuserows, ARRAY_LENGTH(pal12l6pinfuserows),
+		pal12l6pinfusecolumns, ARRAY_LENGTH(pal12l6pinfusecolumns),
 		print_pal12l6_product_terms,
 		config_pal12l6_pins,
 		NULL,
 		NULL},
 	{"PAL14L4", 448,
-		pal14l4pinfuserows, ARRAY_LEN(pal14l4pinfuserows),
-		pal14l4pinfusecolumns, ARRAY_LEN(pal14l4pinfusecolumns),
+		pal14l4pinfuserows, ARRAY_LENGTH(pal14l4pinfuserows),
+		pal14l4pinfusecolumns, ARRAY_LENGTH(pal14l4pinfusecolumns),
 		print_pal14l4_product_terms,
 		config_pal14l4_pins,
 		NULL,
 		NULL},
 	{"PAL16L2", 512,
-		pal16l2pinfuserows, ARRAY_LEN(pal16l2pinfuserows),
-		pal16l2pinfusecolumns, ARRAY_LEN(pal16l2pinfusecolumns),
+		pal16l2pinfuserows, ARRAY_LENGTH(pal16l2pinfuserows),
+		pal16l2pinfusecolumns, ARRAY_LENGTH(pal16l2pinfusecolumns),
 		print_pal16l2_product_terms,
 		config_pal16l2_pins,
 		NULL,
 		NULL},
 	/*{"15S8", 0, NULL, 0, NULL, 0, NULL, NULL, NULL, NULL},*/
 	{"PAL16L8", 2048,
-		pal16l8pinfuserows, ARRAY_LEN(pal16l8pinfuserows),
-		pal16l8pinfusecolumns, ARRAY_LEN(pal16l8pinfusecolumns),
+		pal16l8pinfuserows, ARRAY_LENGTH(pal16l8pinfuserows),
+		pal16l8pinfusecolumns, ARRAY_LENGTH(pal16l8pinfusecolumns),
 		print_pal16l8_product_terms,
 		config_pal16l8_pins,
 		NULL,
 		NULL},
 	{"PAL16R4", 2048,
-		pal16r4pinfuserows, ARRAY_LEN(pal16r4pinfuserows),
-		pal16r4pinfusecolumns, ARRAY_LEN(pal16r4pinfusecolumns),
+		pal16r4pinfuserows, ARRAY_LENGTH(pal16r4pinfuserows),
+		pal16r4pinfusecolumns, ARRAY_LENGTH(pal16r4pinfusecolumns),
 		print_pal16r4_product_terms,
 		config_pal16r4_pins,
 		NULL,
 		NULL},
 	{"PAL16R6", 2048,
-		pal16r6pinfuserows, ARRAY_LEN(pal16r6pinfuserows),
-		pal16r6pinfusecolumns, ARRAY_LEN(pal16r6pinfusecolumns),
+		pal16r6pinfuserows, ARRAY_LENGTH(pal16r6pinfuserows),
+		pal16r6pinfusecolumns, ARRAY_LENGTH(pal16r6pinfusecolumns),
 		print_pal16r6_product_terms,
 		config_pal16r6_pins,
 		NULL,
 		NULL},
 	{"PAL16R8", 2048,
-		pal16r8pinfuserows, ARRAY_LEN(pal16r8pinfuserows),
-		pal16r8pinfusecolumns, ARRAY_LEN(pal16r8pinfusecolumns),
+		pal16r8pinfuserows, ARRAY_LENGTH(pal16r8pinfuserows),
+		pal16r8pinfusecolumns, ARRAY_LENGTH(pal16r8pinfusecolumns),
 		print_pal16r8_product_terms,
 		config_pal16r8_pins,
 		NULL,
@@ -1967,85 +1965,85 @@ static pal_data paldata[] = {
 	/*{"PAL16RA8", 0, NULL, 0, NULL, 0, NULL, NULL, NULL, NULL},
 	{"PAL16V8R", 0, NULL, 0, NULL, 0, NULL, NULL, NULL, NULL},*/
 	{"PALCE16V8", 2194,
-		palce16v8pinfuserows, ARRAY_LEN(palce16v8pinfuserows),
-		palce16v8pinfusecolumns, ARRAY_LEN(palce16v8pinfusecolumns),
+		palce16v8pinfuserows, ARRAY_LENGTH(palce16v8pinfuserows),
+		palce16v8pinfusecolumns, ARRAY_LENGTH(palce16v8pinfusecolumns),
 		print_palce16v8_product_terms,
 		config_palce16v8_pins,
 		NULL,
 		NULL},
 	{"GAL16V8", 2194,
-		gal16v8pinfuserows, ARRAY_LEN(gal16v8pinfuserows),
-		gal16v8pinfusecolumns, ARRAY_LEN(gal16v8pinfusecolumns),
+		gal16v8pinfuserows, ARRAY_LENGTH(gal16v8pinfuserows),
+		gal16v8pinfusecolumns, ARRAY_LENGTH(gal16v8pinfusecolumns),
 		print_gal16v8_product_terms,
 		config_gal16v8_pins,
 		is_gal16v8_product_term_enabled,
 		NULL},
 	{"18CV8", 2696,
-		peel18cv8pinfuserows, ARRAY_LEN(peel18cv8pinfuserows),
-		peel18cv8pinfusecolumns, ARRAY_LEN(peel18cv8pinfusecolumns),
+		peel18cv8pinfuserows, ARRAY_LENGTH(peel18cv8pinfuserows),
+		peel18cv8pinfusecolumns, ARRAY_LENGTH(peel18cv8pinfusecolumns),
 		print_peel18cv8_product_terms,
 		config_peel18cv8_pins,
 		NULL,
 		get_peel18cv8_pin_fuse_state},
 	{"GAL18V10", 3540,
-		gal18v10pinfuserows, ARRAY_LEN(gal18v10pinfuserows),
-		gal18v10pinfusecolumns, ARRAY_LEN(gal18v10pinfusecolumns),
+		gal18v10pinfuserows, ARRAY_LENGTH(gal18v10pinfuserows),
+		gal18v10pinfusecolumns, ARRAY_LENGTH(gal18v10pinfusecolumns),
 		print_gal18v10_product_terms,
 		config_gal18v10_pins,
 		NULL,
 		NULL},
 	{"PAL20L8", 2560,
-		pal20l8pinfuserows, ARRAY_LEN(pal20l8pinfuserows),
-		pal20l8pinfusecolumns, ARRAY_LEN(pal20l8pinfusecolumns),
+		pal20l8pinfuserows, ARRAY_LENGTH(pal20l8pinfuserows),
+		pal20l8pinfusecolumns, ARRAY_LENGTH(pal20l8pinfusecolumns),
 		print_pal20l8_product_terms,
 		config_pal20l8_pins,
 		NULL,
 		NULL},
 	{"PAL20L10", 1600,
-		pal20l10pinfuserows, ARRAY_LEN(pal20l10pinfuserows),
-		pal20l10pinfusecolumns, ARRAY_LEN(pal20l10pinfusecolumns),
+		pal20l10pinfuserows, ARRAY_LENGTH(pal20l10pinfuserows),
+		pal20l10pinfusecolumns, ARRAY_LENGTH(pal20l10pinfusecolumns),
 		print_pal20l10_product_terms,
 		config_pal20l10_pins,
 		NULL,
 		NULL},
 	{"PAL20R4", 2560,
-		pal20r4pinfuserows, ARRAY_LEN(pal20r4pinfuserows),
-		pal20r4pinfusecolumns, ARRAY_LEN(pal20r4pinfusecolumns),
+		pal20r4pinfuserows, ARRAY_LENGTH(pal20r4pinfuserows),
+		pal20r4pinfusecolumns, ARRAY_LENGTH(pal20r4pinfusecolumns),
 		print_pal20r4_product_terms,
 		config_pal20r4_pins,
 		NULL,
 		NULL},
 	{"PAL20R6", 2560,
-		pal20r6pinfuserows, ARRAY_LEN(pal20r6pinfuserows),
-		pal20r6pinfusecolumns, ARRAY_LEN(pal20r6pinfusecolumns),
+		pal20r6pinfuserows, ARRAY_LENGTH(pal20r6pinfuserows),
+		pal20r6pinfusecolumns, ARRAY_LENGTH(pal20r6pinfusecolumns),
 		print_pal20r6_product_terms,
 		config_pal20r6_pins,
 		NULL,
 		NULL},
 	{"PAL20R8", 2560,
-		pal20r8pinfuserows, ARRAY_LEN(pal20r8pinfuserows),
-		pal20r8pinfusecolumns, ARRAY_LEN(pal20r8pinfusecolumns),
+		pal20r8pinfuserows, ARRAY_LENGTH(pal20r8pinfuserows),
+		pal20r8pinfusecolumns, ARRAY_LENGTH(pal20r8pinfusecolumns),
 		print_pal20r8_product_terms,
 		config_pal20r8_pins,
 		NULL,
 		NULL},
 	{"PAL20X4", 1600,
-		pal20x4pinfuserows, ARRAY_LEN(pal20x4pinfuserows),
-		pal20x4pinfusecolumns, ARRAY_LEN(pal20x4pinfusecolumns),
+		pal20x4pinfuserows, ARRAY_LENGTH(pal20x4pinfuserows),
+		pal20x4pinfusecolumns, ARRAY_LENGTH(pal20x4pinfusecolumns),
 		print_pal20x4_product_terms,
 		config_pal20x4_pins,
 		NULL,
 		NULL},
 	{"PAL20X8", 1600,
-		pal20x8pinfuserows, ARRAY_LEN(pal20x8pinfuserows),
-		pal20x8pinfusecolumns, ARRAY_LEN(pal20x8pinfusecolumns),
+		pal20x8pinfuserows, ARRAY_LENGTH(pal20x8pinfuserows),
+		pal20x8pinfusecolumns, ARRAY_LENGTH(pal20x8pinfusecolumns),
 		print_pal20x8_product_terms,
 		config_pal20x8_pins,
 		NULL,
 		NULL},
 	{"PAL20X10", 1600,
-		pal20x10pinfuserows, ARRAY_LEN(pal20x10pinfuserows),
-		pal20x10pinfusecolumns, ARRAY_LEN(pal20x10pinfusecolumns),
+		pal20x10pinfuserows, ARRAY_LENGTH(pal20x10pinfuserows),
+		pal20x10pinfusecolumns, ARRAY_LENGTH(pal20x10pinfusecolumns),
 		print_pal20x10_product_terms,
 		config_pal20x10_pins,
 		NULL,
@@ -2055,220 +2053,220 @@ static pal_data paldata[] = {
 	{"GAL22V10", 0, NULL, 0, NULL, 0, NULL, NULL, NULL, NULL},
 	{"PLS100", 0, NULL, 0, NULL, 0, NULL, NULL, NULL, NULL},*/
 	{"82S153", 1842,
-		_82s153_pls153pinfuserows, ARRAY_LEN(_82s153_pls153pinfuserows),
-		_82s153_pls153pinfusecolumns, ARRAY_LEN(_82s153_pls153pinfusecolumns),
+		_82s153_pls153pinfuserows, ARRAY_LENGTH(_82s153_pls153pinfuserows),
+		_82s153_pls153pinfusecolumns, ARRAY_LENGTH(_82s153_pls153pinfusecolumns),
 		print_82s153_pls153_product_terms,
 		config_82s153_pls153_pins,
 		NULL,
 		NULL},
 	{"PLS153", 1842,
-		_82s153_pls153pinfuserows, ARRAY_LEN(_82s153_pls153pinfuserows),
-		_82s153_pls153pinfusecolumns, ARRAY_LEN(_82s153_pls153pinfusecolumns),
+		_82s153_pls153pinfuserows, ARRAY_LENGTH(_82s153_pls153pinfuserows),
+		_82s153_pls153pinfusecolumns, ARRAY_LENGTH(_82s153_pls153pinfusecolumns),
 		print_82s153_pls153_product_terms,
 		config_82s153_pls153_pins,
 		NULL,
 		NULL},
 	{"CK2605", 1106,
-		ck2605pinfuserows, ARRAY_LEN(ck2605pinfuserows),
-		ck2605pinfusecolumns, ARRAY_LEN(ck2605pinfusecolumns),
+		ck2605pinfuserows, ARRAY_LENGTH(ck2605pinfuserows),
+		ck2605pinfusecolumns, ARRAY_LENGTH(ck2605pinfusecolumns),
 		print_ck2605_product_terms,
 		config_ck2605_pins,
 		NULL,
 		NULL},
 #if defined(ricoh_pals)
 	{"EPL10P8", 664,
-		epl10p8pinfuserows, ARRAY_LEN(epl10p8pinfuserows),
-		epl10p8pinfusecolumns, ARRAY_LEN(epl10p8pinfusecolumns),
+		epl10p8pinfuserows, ARRAY_LENGTH(epl10p8pinfuserows),
+		epl10p8pinfusecolumns, ARRAY_LENGTH(epl10p8pinfusecolumns),
 		print_epl10p8_product_terms,
 		config_epl10p8_pins,
 		NULL,
 		NULL},
 	{"EPL12P6", 786,
-		epl12p6pinfuserows, ARRAY_LEN(epl12p6pinfuserows),
-		epl12p6pinfusecolumns, ARRAY_LEN(epl12p6pinfusecolumns),
+		epl12p6pinfuserows, ARRAY_LENGTH(epl12p6pinfuserows),
+		epl12p6pinfusecolumns, ARRAY_LENGTH(epl12p6pinfusecolumns),
 		print_epl12p6_product_terms,
 		config_epl12p6_pins,
 		NULL,
 		NULL},
 	{"EPL14P4", 908,
-		epl14p4pinfuserows, ARRAY_LEN(epl14p4pinfuserows),
-		epl14p4pinfusecolumns, ARRAY_LEN(epl14p4pinfusecolumns),
+		epl14p4pinfuserows, ARRAY_LENGTH(epl14p4pinfuserows),
+		epl14p4pinfusecolumns, ARRAY_LENGTH(epl14p4pinfusecolumns),
 		print_epl14p4_product_terms,
 		config_epl14p4_pins,
 		NULL,
 		NULL},
 	{"EPL16P2", 1030,
-		epl16p2pinfuserows, ARRAY_LEN(epl16p2pinfuserows),
-		epl16p2pinfusecolumns, ARRAY_LEN(epl16p2pinfusecolumns),
+		epl16p2pinfuserows, ARRAY_LENGTH(epl16p2pinfuserows),
+		epl16p2pinfusecolumns, ARRAY_LENGTH(epl16p2pinfusecolumns),
 		print_epl16p2_product_terms,
 		config_epl16p2_pins,
 		NULL,
 		NULL},
 	{"EPL16P8", 2072,
-		epl16p8pinfuserows, ARRAY_LEN(epl16p8pinfuserows),
-		epl16p8pinfusecolumns, ARRAY_LEN(epl16p8pinfusecolumns),
+		epl16p8pinfuserows, ARRAY_LENGTH(epl16p8pinfuserows),
+		epl16p8pinfusecolumns, ARRAY_LENGTH(epl16p8pinfusecolumns),
 		print_epl16p8_product_terms,
 		config_epl16p8_pins,
 		NULL,
 		NULL},
 	{"EPL16RP8", 2072,
-		epl16rp8pinfuserows, ARRAY_LEN(epl16rp8pinfuserows),
-		epl16rp8pinfusecolumns, ARRAY_LEN(epl16rp8pinfusecolumns),
+		epl16rp8pinfuserows, ARRAY_LENGTH(epl16rp8pinfuserows),
+		epl16rp8pinfusecolumns, ARRAY_LENGTH(epl16rp8pinfusecolumns),
 		print_epl16rp8_product_terms,
 		config_epl16rp8_pins,
 		NULL,
 		NULL},
 	{"EPL16RP6", 2072,
-		epl16rp6pinfuserows, ARRAY_LEN(epl16rp6pinfuserows),
-		epl16rp6pinfusecolumns, ARRAY_LEN(epl16rp6pinfusecolumns),
+		epl16rp6pinfuserows, ARRAY_LENGTH(epl16rp6pinfuserows),
+		epl16rp6pinfusecolumns, ARRAY_LENGTH(epl16rp6pinfusecolumns),
 		print_epl16rp6_product_terms,
 		config_epl16rp6_pins,
 		NULL,
 		NULL},
 	{"EPL16RP4", 2072,
-		epl16rp4pinfuserows, ARRAY_LEN(epl16rp4pinfuserows),
-		epl16rp4pinfusecolumns, ARRAY_LEN(epl16rp4pinfusecolumns),
+		epl16rp4pinfuserows, ARRAY_LENGTH(epl16rp4pinfuserows),
+		epl16rp4pinfusecolumns, ARRAY_LENGTH(epl16rp4pinfusecolumns),
 		print_epl16rp4_product_terms,
 		config_epl16rp4_pins,
 		NULL,
 		NULL},
 #endif
 	{"PAL10P8", 328,
-		pal10p8pinfuserows, ARRAY_LEN(pal10p8pinfuserows),
-		pal10p8pinfusecolumns, ARRAY_LEN(pal10p8pinfusecolumns),
+		pal10p8pinfuserows, ARRAY_LENGTH(pal10p8pinfuserows),
+		pal10p8pinfusecolumns, ARRAY_LENGTH(pal10p8pinfusecolumns),
 		print_pal10p8_product_terms,
 		config_pal10p8_pins,
 		NULL,
 		NULL},
 	{"PAL12P6", 390,
-		pal12p6pinfuserows, ARRAY_LEN(pal12p6pinfuserows),
-		pal12p6pinfusecolumns, ARRAY_LEN(pal12p6pinfusecolumns),
+		pal12p6pinfuserows, ARRAY_LENGTH(pal12p6pinfuserows),
+		pal12p6pinfusecolumns, ARRAY_LENGTH(pal12p6pinfusecolumns),
 		print_pal12p6_product_terms,
 		config_pal12p6_pins,
 		NULL,
 		NULL},
 	{"PAL14P4", 452,
-		pal14p4pinfuserows, ARRAY_LEN(pal14p4pinfuserows),
-		pal14p4pinfusecolumns, ARRAY_LEN(pal14p4pinfusecolumns),
+		pal14p4pinfuserows, ARRAY_LENGTH(pal14p4pinfuserows),
+		pal14p4pinfusecolumns, ARRAY_LENGTH(pal14p4pinfusecolumns),
 		print_pal14p4_product_terms,
 		config_pal14p4_pins,
 		NULL,
 		NULL},
 	{"PAL16P2", 514,
-		pal16p2pinfuserows, ARRAY_LEN(pal16p2pinfuserows),
-		pal16p2pinfusecolumns, ARRAY_LEN(pal16p2pinfusecolumns),
+		pal16p2pinfuserows, ARRAY_LENGTH(pal16p2pinfuserows),
+		pal16p2pinfusecolumns, ARRAY_LENGTH(pal16p2pinfusecolumns),
 		print_pal16p2_product_terms,
 		config_pal16p2_pins,
 		NULL,
 		NULL},
 	{"PAL16P8", 2056,
-		pal16p8pinfuserows, ARRAY_LEN(pal16p8pinfuserows),
-		pal16p8pinfusecolumns, ARRAY_LEN(pal16p8pinfusecolumns),
+		pal16p8pinfuserows, ARRAY_LENGTH(pal16p8pinfuserows),
+		pal16p8pinfusecolumns, ARRAY_LENGTH(pal16p8pinfusecolumns),
 		print_pal16p8_product_terms,
 		config_pal16p8_pins,
 		NULL,
 		NULL},
 	{"PAL16RP4", 2056,
-		pal16rp4pinfuserows, ARRAY_LEN(pal16rp4pinfuserows),
-		pal16rp4pinfusecolumns, ARRAY_LEN(pal16rp4pinfusecolumns),
+		pal16rp4pinfuserows, ARRAY_LENGTH(pal16rp4pinfuserows),
+		pal16rp4pinfusecolumns, ARRAY_LENGTH(pal16rp4pinfusecolumns),
 		print_pal16rp4_product_terms,
 		config_pal16rp4_pins,
 		NULL,
 		NULL},
 	{"PAL16RP6", 2056,
-		pal16rp6pinfuserows, ARRAY_LEN(pal16rp6pinfuserows),
-		pal16rp6pinfusecolumns, ARRAY_LEN(pal16rp6pinfusecolumns),
+		pal16rp6pinfuserows, ARRAY_LENGTH(pal16rp6pinfuserows),
+		pal16rp6pinfusecolumns, ARRAY_LENGTH(pal16rp6pinfusecolumns),
 		print_pal16rp6_product_terms,
 		config_pal16rp6_pins,
 		NULL,
 		NULL},
 	{"PAL16RP8", 2056,
-		pal16rp8pinfuserows, ARRAY_LEN(pal16rp8pinfuserows),
-		pal16rp8pinfusecolumns, ARRAY_LEN(pal16rp8pinfusecolumns),
+		pal16rp8pinfuserows, ARRAY_LENGTH(pal16rp8pinfuserows),
+		pal16rp8pinfusecolumns, ARRAY_LENGTH(pal16rp8pinfusecolumns),
 		print_pal16rp8_product_terms,
 		config_pal16rp8_pins,
 		NULL,
 		NULL},
 	{"PAL6L16", 192,
-		pal6l16pinfuserows, ARRAY_LEN(pal6l16pinfuserows),
-		pal6l16pinfusecolumns, ARRAY_LEN(pal6l16pinfusecolumns),
+		pal6l16pinfuserows, ARRAY_LENGTH(pal6l16pinfuserows),
+		pal6l16pinfusecolumns, ARRAY_LENGTH(pal6l16pinfusecolumns),
 		print_pal6l16_product_terms,
 		config_pal6l16_pins,
 		NULL,
 		NULL},
 	{"PAL8L14", 224,
-		pal8l14pinfuserows, ARRAY_LEN(pal8l14pinfuserows),
-		pal8l14pinfusecolumns, ARRAY_LEN(pal8l14pinfusecolumns),
+		pal8l14pinfuserows, ARRAY_LENGTH(pal8l14pinfuserows),
+		pal8l14pinfusecolumns, ARRAY_LENGTH(pal8l14pinfusecolumns),
 		print_pal8l14_product_terms,
 		config_pal8l14_pins,
 		NULL,
 		NULL},
 	{"PAL12H10", 480,
-		pal12h10pinfuserows, ARRAY_LEN(pal12h10pinfuserows),
-		pal12h10pinfusecolumns, ARRAY_LEN(pal12h10pinfusecolumns),
+		pal12h10pinfuserows, ARRAY_LENGTH(pal12h10pinfuserows),
+		pal12h10pinfusecolumns, ARRAY_LENGTH(pal12h10pinfusecolumns),
 		print_pal12h10_product_terms,
 		config_pal12h10_pins,
 		NULL,
 		NULL},
 	{"PAL12L10", 480,
-		pal12l10pinfuserows, ARRAY_LEN(pal12l10pinfuserows),
-		pal12l10pinfusecolumns, ARRAY_LEN(pal12l10pinfusecolumns),
+		pal12l10pinfuserows, ARRAY_LENGTH(pal12l10pinfuserows),
+		pal12l10pinfusecolumns, ARRAY_LENGTH(pal12l10pinfusecolumns),
 		print_pal12l10_product_terms,
 		config_pal12l10_pins,
 		NULL,
 		NULL},
 	{"PAL14H8", 560,
-		pal14h8pinfuserows, ARRAY_LEN(pal14h8pinfuserows),
-		pal14h8pinfusecolumns, ARRAY_LEN(pal14h8pinfusecolumns),
+		pal14h8pinfuserows, ARRAY_LENGTH(pal14h8pinfuserows),
+		pal14h8pinfusecolumns, ARRAY_LENGTH(pal14h8pinfusecolumns),
 		print_pal14h8_product_terms,
 		config_pal14h8_pins,
 		NULL,
 		NULL},
 	{"PAL14L8", 560,
-		pal14l8pinfuserows, ARRAY_LEN(pal14l8pinfuserows),
-		pal14l8pinfusecolumns, ARRAY_LEN(pal14l8pinfusecolumns),
+		pal14l8pinfuserows, ARRAY_LENGTH(pal14l8pinfuserows),
+		pal14l8pinfusecolumns, ARRAY_LENGTH(pal14l8pinfusecolumns),
 		print_pal14l8_product_terms,
 		config_pal14l8_pins,
 		NULL,
 		NULL},
 	{"PAL16H6", 640,
-		pal16h6pinfuserows, ARRAY_LEN(pal16h6pinfuserows),
-		pal16h6pinfusecolumns, ARRAY_LEN(pal16h6pinfusecolumns),
+		pal16h6pinfuserows, ARRAY_LENGTH(pal16h6pinfuserows),
+		pal16h6pinfusecolumns, ARRAY_LENGTH(pal16h6pinfusecolumns),
 		print_pal16h6_product_terms,
 		config_pal16h6_pins,
 		NULL,
 		NULL},
 	{"PAL16L6", 640,
-		pal16l6pinfuserows, ARRAY_LEN(pal16l6pinfuserows),
-		pal16l6pinfusecolumns, ARRAY_LEN(pal16l6pinfusecolumns),
+		pal16l6pinfuserows, ARRAY_LENGTH(pal16l6pinfuserows),
+		pal16l6pinfusecolumns, ARRAY_LENGTH(pal16l6pinfusecolumns),
 		print_pal16l6_product_terms,
 		config_pal16l6_pins,
 		NULL,
 		NULL},
 	{"PAL18H4", 720,
-		pal18h4pinfuserows, ARRAY_LEN(pal18h4pinfuserows),
-		pal18h4pinfusecolumns, ARRAY_LEN(pal18h4pinfusecolumns),
+		pal18h4pinfuserows, ARRAY_LENGTH(pal18h4pinfuserows),
+		pal18h4pinfusecolumns, ARRAY_LENGTH(pal18h4pinfusecolumns),
 		print_pal18h4_product_terms,
 		config_pal18h4_pins,
 		NULL,
 		NULL},
 	{"PAL18L4", 720,
-		pal18l4pinfuserows, ARRAY_LEN(pal18l4pinfuserows),
-		pal18l4pinfusecolumns, ARRAY_LEN(pal18l4pinfusecolumns),
+		pal18l4pinfuserows, ARRAY_LENGTH(pal18l4pinfuserows),
+		pal18l4pinfusecolumns, ARRAY_LENGTH(pal18l4pinfusecolumns),
 		print_pal18l4_product_terms,
 		config_pal18l4_pins,
 		NULL,
 		NULL},
 	{"PAL20C1", 640,
-		pal20c1pinfuserows, ARRAY_LEN(pal20c1pinfuserows),
-		pal20c1pinfusecolumns, ARRAY_LEN(pal20c1pinfusecolumns),
+		pal20c1pinfuserows, ARRAY_LENGTH(pal20c1pinfuserows),
+		pal20c1pinfusecolumns, ARRAY_LENGTH(pal20c1pinfusecolumns),
 		print_pal20c1_product_terms,
 		config_pal20c1_pins,
 		NULL,
 		NULL},
 	{"PAL20L2", 640,
-		pal20l2pinfuserows, ARRAY_LEN(pal20l2pinfuserows),
-		pal20l2pinfusecolumns, ARRAY_LEN(pal20l2pinfusecolumns),
+		pal20l2pinfuserows, ARRAY_LENGTH(pal20l2pinfuserows),
+		pal20l2pinfusecolumns, ARRAY_LENGTH(pal20l2pinfusecolumns),
 		print_pal20l2_product_terms,
 		config_pal20l2_pins,
 		NULL,
@@ -2327,7 +2325,7 @@ static const pal_data* find_pal_data(const char *name)
 {
 	int index;
 
-	for (index = 0; index < ARRAY_LEN(paldata); ++index)
+	for (index = 0; index < ARRAY_LENGTH(paldata); ++index)
 	{
 		if (!core_stricmp(name, paldata[index].name))
 		{
@@ -2987,7 +2985,7 @@ static void config_palce16v8_pin_as_7_product_terms_and_oe_term(UINT16 pin)
 		{19, 0, 32, 224}};
 	UINT16 index;
 
-	for (index = 0; index < ARRAY_LEN(pinfuserows); ++index)
+	for (index = 0; index < ARRAY_LENGTH(pinfuserows); ++index)
 	{
 		if (pinfuserows[index].pin == pin)
 		{
@@ -3021,7 +3019,7 @@ static void config_palce16v8_pin_as_8_product_terms(UINT16 pin)
 		{19, NO_OUTPUT_ENABLE_FUSE_ROW, 0, 224}};
 	UINT16 index;
 
-	for (index = 0; index < ARRAY_LEN(pinfuserows); ++index)
+	for (index = 0; index < ARRAY_LENGTH(pinfuserows); ++index)
 	{
 		if (pinfuserows[index].pin == pin)
 		{
@@ -3787,7 +3785,7 @@ static void print_epl10p8_product_terms(const pal_data* pal, const jed_data* jed
 
 	printf("Equations:\n\n");
 
-	for (index = 0; index < ARRAY_LEN(memory_cells); ++index)
+	for (index = 0; index < ARRAY_LENGTH(memory_cells); ++index)
 	{
 		flags = outputpins[index].flags;
 
@@ -4246,8 +4244,8 @@ static void config_pal10l8_pins(const pal_data* pal, const jed_data* jed)
 		{18, OUTPUT_ACTIVELOW | OUTPUT_COMBINATORIAL | OUTPUT_FEEDBACK_NONE},
 		{19, OUTPUT_ACTIVELOW | OUTPUT_COMBINATORIAL | OUTPUT_FEEDBACK_NONE}};
 
-	set_input_pins(input_pins, ARRAY_LEN(input_pins));
-	set_output_pins(output_pins, ARRAY_LEN(output_pins));
+	set_input_pins(input_pins, ARRAY_LENGTH(input_pins));
+	set_output_pins(output_pins, ARRAY_LENGTH(output_pins));
 }
 
 
@@ -4270,8 +4268,8 @@ static void config_pal10h8_pins(const pal_data* pal, const jed_data* jed)
 		{18, OUTPUT_ACTIVEHIGH | OUTPUT_COMBINATORIAL | OUTPUT_FEEDBACK_NONE},
 		{19, OUTPUT_ACTIVEHIGH | OUTPUT_COMBINATORIAL | OUTPUT_FEEDBACK_NONE}};
 
-	set_input_pins(input_pins, ARRAY_LEN(input_pins));
-	set_output_pins(output_pins, ARRAY_LEN(output_pins));
+	set_input_pins(input_pins, ARRAY_LENGTH(input_pins));
+	set_output_pins(output_pins, ARRAY_LENGTH(output_pins));
 }
 
 
@@ -4292,8 +4290,8 @@ static void config_pal12l6_pins(const pal_data* pal, const jed_data* jed)
 		{17, OUTPUT_ACTIVELOW | OUTPUT_COMBINATORIAL | OUTPUT_FEEDBACK_NONE},
 		{18, OUTPUT_ACTIVELOW | OUTPUT_COMBINATORIAL | OUTPUT_FEEDBACK_NONE}};
 
-	set_input_pins(input_pins, ARRAY_LEN(input_pins));
-	set_output_pins(output_pins, ARRAY_LEN(output_pins));
+	set_input_pins(input_pins, ARRAY_LENGTH(input_pins));
+	set_output_pins(output_pins, ARRAY_LENGTH(output_pins));
 }
 
 
@@ -4314,8 +4312,8 @@ static void config_pal12h6_pins(const pal_data* pal, const jed_data* jed)
 		{17, OUTPUT_ACTIVEHIGH | OUTPUT_COMBINATORIAL | OUTPUT_FEEDBACK_NONE},
 		{18, OUTPUT_ACTIVEHIGH | OUTPUT_COMBINATORIAL | OUTPUT_FEEDBACK_NONE}};
 
-	set_input_pins(input_pins, ARRAY_LEN(input_pins));
-	set_output_pins(output_pins, ARRAY_LEN(output_pins));
+	set_input_pins(input_pins, ARRAY_LENGTH(input_pins));
+	set_output_pins(output_pins, ARRAY_LENGTH(output_pins));
 }
 
 
@@ -4334,8 +4332,8 @@ static void config_pal14l4_pins(const pal_data* pal, const jed_data* jed)
 		{16, OUTPUT_ACTIVELOW | OUTPUT_COMBINATORIAL | OUTPUT_FEEDBACK_NONE},
 		{17, OUTPUT_ACTIVELOW | OUTPUT_COMBINATORIAL | OUTPUT_FEEDBACK_NONE}};
 
-	set_input_pins(input_pins, ARRAY_LEN(input_pins));
-	set_output_pins(output_pins, ARRAY_LEN(output_pins));
+	set_input_pins(input_pins, ARRAY_LENGTH(input_pins));
+	set_output_pins(output_pins, ARRAY_LENGTH(output_pins));
 }
 
 
@@ -4354,8 +4352,8 @@ static void config_pal14h4_pins(const pal_data* pal, const jed_data* jed)
 		{16, OUTPUT_ACTIVEHIGH | OUTPUT_COMBINATORIAL | OUTPUT_FEEDBACK_NONE},
 		{17, OUTPUT_ACTIVEHIGH | OUTPUT_COMBINATORIAL | OUTPUT_FEEDBACK_NONE}};
 
-	set_input_pins(input_pins, ARRAY_LEN(input_pins));
-	set_output_pins(output_pins, ARRAY_LEN(output_pins));
+	set_input_pins(input_pins, ARRAY_LENGTH(input_pins));
+	set_output_pins(output_pins, ARRAY_LENGTH(output_pins));
 }
 
 
@@ -4372,8 +4370,8 @@ static void config_pal16l2_pins(const pal_data* pal, const jed_data* jed)
 		{15, OUTPUT_ACTIVELOW | OUTPUT_COMBINATORIAL | OUTPUT_FEEDBACK_NONE},
 		{16, OUTPUT_ACTIVELOW | OUTPUT_COMBINATORIAL | OUTPUT_FEEDBACK_NONE}};
 
-	set_input_pins(input_pins, ARRAY_LEN(input_pins));
-	set_output_pins(output_pins, ARRAY_LEN(output_pins));
+	set_input_pins(input_pins, ARRAY_LENGTH(input_pins));
+	set_output_pins(output_pins, ARRAY_LENGTH(output_pins));
 }
 
 
@@ -4390,8 +4388,8 @@ static void config_pal16h2_pins(const pal_data* pal, const jed_data* jed)
 		{15, OUTPUT_ACTIVEHIGH | OUTPUT_COMBINATORIAL | OUTPUT_FEEDBACK_NONE},
 		{16, OUTPUT_ACTIVEHIGH | OUTPUT_COMBINATORIAL | OUTPUT_FEEDBACK_NONE}};
 
-	set_input_pins(input_pins, ARRAY_LEN(input_pins));
-	set_output_pins(output_pins, ARRAY_LEN(output_pins));
+	set_input_pins(input_pins, ARRAY_LENGTH(input_pins));
+	set_output_pins(output_pins, ARRAY_LENGTH(output_pins));
 }
 
 
@@ -4408,8 +4406,8 @@ static void config_pal16c1_pins(const pal_data* pal, const jed_data* jed)
 		{15, OUTPUT_ACTIVELOW | OUTPUT_COMBINATORIAL | OUTPUT_FEEDBACK_NONE},
 		{16, OUTPUT_ACTIVEHIGH | OUTPUT_COMBINATORIAL | OUTPUT_FEEDBACK_NONE}};
 
-	set_input_pins(input_pins, ARRAY_LEN(input_pins));
-	set_output_pins(output_pins, ARRAY_LEN(output_pins));
+	set_input_pins(input_pins, ARRAY_LENGTH(input_pins));
+	set_output_pins(output_pins, ARRAY_LENGTH(output_pins));
 }
 
 
@@ -4438,7 +4436,7 @@ static void config_pal16l8_pins(const pal_data* pal, const jed_data* jed)
 		}
 	}
 
-	set_input_pins(input_pins, ARRAY_LEN(input_pins));
+	set_input_pins(input_pins, ARRAY_LENGTH(input_pins));
 	set_output_pins(output_pins, output_pin_count);
 }
 
@@ -4474,7 +4472,7 @@ static void config_pal16r4_pins(const pal_data* pal, const jed_data* jed)
 		++output_pin_count;
 	}
 
-	for (index = 0; index < ARRAY_LEN(registered_pins); ++index)
+	for (index = 0; index < ARRAY_LENGTH(registered_pins); ++index)
 	{
 		output_pins[output_pin_count].pin = registered_pins[index];
 		output_pins[output_pin_count].flags = OUTPUT_ACTIVELOW | OUTPUT_REGISTERED | OUTPUT_FEEDBACK_REGISTERED;
@@ -4498,7 +4496,7 @@ static void config_pal16r4_pins(const pal_data* pal, const jed_data* jed)
 		++output_pin_count;
 	}
 
-	set_input_pins(input_pins, ARRAY_LEN(input_pins));
+	set_input_pins(input_pins, ARRAY_LENGTH(input_pins));
 	set_output_pins(output_pins, output_pin_count);
 }
 
@@ -4526,7 +4524,7 @@ static void config_pal16r6_pins(const pal_data* pal, const jed_data* jed)
 		++output_pin_count;
 	}
 
-	for (index = 0; index < ARRAY_LEN(registered_pins); ++index)
+	for (index = 0; index < ARRAY_LENGTH(registered_pins); ++index)
 	{
 		output_pins[output_pin_count].pin = registered_pins[index];
 		output_pins[output_pin_count].flags = OUTPUT_ACTIVELOW | OUTPUT_REGISTERED | OUTPUT_FEEDBACK_REGISTERED;
@@ -4542,7 +4540,7 @@ static void config_pal16r6_pins(const pal_data* pal, const jed_data* jed)
 		++output_pin_count;
 	}
 
-	set_input_pins(input_pins, ARRAY_LEN(input_pins));
+	set_input_pins(input_pins, ARRAY_LENGTH(input_pins));
 	set_output_pins(output_pins, output_pin_count);
 }
 
@@ -4566,8 +4564,8 @@ static void config_pal16r8_pins(const pal_data* pal, const jed_data* jed)
 		{18, OUTPUT_ACTIVELOW | OUTPUT_REGISTERED | OUTPUT_FEEDBACK_REGISTERED},
 		{19, OUTPUT_ACTIVELOW | OUTPUT_REGISTERED | OUTPUT_FEEDBACK_REGISTERED}};
 
-	set_input_pins(input_pins, ARRAY_LEN(input_pins));
-	set_output_pins(output_pins, ARRAY_LEN(output_pins));
+	set_input_pins(input_pins, ARRAY_LENGTH(input_pins));
+	set_output_pins(output_pins, ARRAY_LENGTH(output_pins));
 }
 
 
@@ -4654,7 +4652,7 @@ static void config_palce16v8_pins(const pal_data* pal, const jed_data* jed)
 	static UINT16 sg0 = 2192;
 	static UINT16 sg1 = 2193;
 	UINT16 input_pins[18];
-	pin_output_config output_pins[ARRAY_LEN(macrocells)];
+	pin_output_config output_pins[ARRAY_LENGTH(macrocells)];
 	UINT16 index, input_pin_count, output_pin_count;
 
 	input_pin_count = 0;
@@ -4670,9 +4668,9 @@ static void config_palce16v8_pins(const pal_data* pal, const jed_data* jed)
 
 			memcpy(input_pins, input_pins_regs, sizeof(input_pins_regs));
 
-			input_pin_count = ARRAY_LEN(input_pins_regs);
+			input_pin_count = ARRAY_LENGTH(input_pins_regs);
 
-			for (index = 0; index < ARRAY_LEN(macrocells); ++index)
+			for (index = 0; index < ARRAY_LENGTH(macrocells); ++index)
 			{
 				if (!jed_get_fuse(jed, macrocells[index].sl0_fuse))
 				{
@@ -4744,9 +4742,9 @@ static void config_palce16v8_pins(const pal_data* pal, const jed_data* jed)
 
 			memcpy(input_pins, input_pins_io, sizeof(input_pins_io));
 
-			input_pin_count = ARRAY_LEN(input_pins_io);
+			input_pin_count = ARRAY_LENGTH(input_pins_io);
 
-			for (index = 0; index < ARRAY_LEN(macrocells); ++index)
+			for (index = 0; index < ARRAY_LENGTH(macrocells); ++index)
 			{
 				if (does_output_enable_fuse_row_allow_output(pal, jed, macrocells[index].fuserowoutputenable))
 				{
@@ -4785,9 +4783,9 @@ static void config_palce16v8_pins(const pal_data* pal, const jed_data* jed)
 
 			memcpy(input_pins, input_pins_i_or_o, sizeof(input_pins_i_or_o));
 
-			input_pin_count = ARRAY_LEN(input_pins_i_or_o);
+			input_pin_count = ARRAY_LENGTH(input_pins_i_or_o);
 
-			for (index = 0; index < ARRAY_LEN(macrocells); ++index)
+			for (index = 0; index < ARRAY_LENGTH(macrocells); ++index)
 			{
 				if (!jed_get_fuse(jed, macrocells[index].sl0_fuse))
 				{
@@ -4934,7 +4932,7 @@ static void config_gal16v8_pins(const pal_data* pal, const jed_data* jed)
 	static UINT16 input_pins_registered[] = {2, 3, 4, 5, 6, 7, 8, 9, 12, 13, 14, 15, 16, 17, 18, 19};
 	static UINT16 input_pins_combinatorialcomplex[] = {1, 2, 3, 4, 5, 6, 7, 8, 9, 11, 13, 14, 15, 16, 17, 18};
 	static UINT16 input_pins_combinatorialsimple[] = {1, 2, 3, 4, 5, 6, 7, 8, 9, 11, 12, 13, 14, 17, 18, 19};
-	pin_output_config output_pins[ARRAY_LEN(macrocells)];
+	pin_output_config output_pins[ARRAY_LENGTH(macrocells)];
 	UINT16 index, output_pin_count;
 
 	output_pin_count = 0;
@@ -4950,12 +4948,12 @@ static void config_gal16v8_pins(const pal_data* pal, const jed_data* jed)
 		{
 			/* Complex Mode */
 
-			set_input_pins(input_pins_combinatorialcomplex, ARRAY_LEN(input_pins_combinatorialcomplex));
+			set_input_pins(input_pins_combinatorialcomplex, ARRAY_LENGTH(input_pins_combinatorialcomplex));
 
 			memcpy(gal16v8pinfuserows, pinfuserows_combinatorial, sizeof(pinfuserows_combinatorial));
 			memcpy(gal16v8pinfusecolumns, pinfusecolumns_combinatorialcomplex, sizeof(pinfusecolumns_combinatorialcomplex));
 
-			for (index = 0; index < ARRAY_LEN(macrocells); ++index)
+			for (index = 0; index < ARRAY_LENGTH(macrocells); ++index)
 			{
 				if (is_gal16v8_product_term_enabled(pal, jed, pal->pinfuserows[index].fuserowoutputenable) &&
 					does_output_enable_fuse_row_allow_output(pal, jed, pal->pinfuserows[index].fuserowoutputenable))
@@ -4990,12 +4988,12 @@ static void config_gal16v8_pins(const pal_data* pal, const jed_data* jed)
 		{
 			/* Simple Mode */
 
-			set_input_pins(input_pins_combinatorialsimple, ARRAY_LEN(input_pins_combinatorialsimple));
+			set_input_pins(input_pins_combinatorialsimple, ARRAY_LENGTH(input_pins_combinatorialsimple));
 
 			memcpy(gal16v8pinfuserows, pinfuserows_registered, sizeof(pinfuserows_registered));
 			memcpy(gal16v8pinfusecolumns, pinfusecolumns_combinatorialsimple, sizeof(pinfusecolumns_combinatorialsimple));
 
-			for (index = 0; index < ARRAY_LEN(macrocells); ++index)
+			for (index = 0; index < ARRAY_LENGTH(macrocells); ++index)
 			{
 				if (jed_get_fuse(jed, macrocells[index].ac1_fuse))
 				{
@@ -5040,11 +5038,11 @@ static void config_gal16v8_pins(const pal_data* pal, const jed_data* jed)
 	{
 		/* Registered */
 
-		set_input_pins(input_pins_registered, ARRAY_LEN(input_pins_registered));
+		set_input_pins(input_pins_registered, ARRAY_LENGTH(input_pins_registered));
 
 		memcpy(gal16v8pinfusecolumns, pinfusecolumns_registered, sizeof(pinfusecolumns_registered));
 
-		for (index = 0; index < ARRAY_LEN(macrocells); ++index)
+		for (index = 0; index < ARRAY_LENGTH(macrocells); ++index)
 		{
 			if (jed_get_fuse(jed, macrocells[index].ac1_fuse))
 			{
@@ -5129,14 +5127,14 @@ static void config_peel18cv8_pins(const pal_data* pal, const jed_data* jed)
 		{18, 2668, 2669, 2670, 2671},
 		{19, 2664, 2665, 2666, 2667}};
 	static UINT16 input_pins[] = {1, 2, 3, 4, 5, 6, 7, 8, 9, 11, 12, 13, 14, 15, 16, 17, 18, 19};
-	pin_output_config output_pins[ARRAY_LEN(macrocells)];
+	pin_output_config output_pins[ARRAY_LENGTH(macrocells)];
 	UINT16 index, output_pin_count;
 
-	set_input_pins(input_pins, ARRAY_LEN(input_pins));
+	set_input_pins(input_pins, ARRAY_LENGTH(input_pins));
 
 	output_pin_count = 0;
 
-	for (index = 0; index < ARRAY_LEN(macrocells); ++index)
+	for (index = 0; index < ARRAY_LENGTH(macrocells); ++index)
 	{
 		if (jed_get_fuse(jed, macrocells[index].feedback1_fuse) &&
 			!jed_get_fuse(jed, macrocells[index].feedback2_fuse))
@@ -5267,12 +5265,12 @@ static void config_gal18v10_pins(const pal_data* pal, const jed_data* jed)
 		{18, 3458, 3459},
 		{19, 3456, 3457}};
 	static UINT16 input_pins[] = {1, 2, 3, 4, 5, 6, 7, 8, 9, 11, 12, 13, 14, 15, 16, 17, 18, 19};
-	pin_output_config output_pins[ARRAY_LEN(macrocells)];
+	pin_output_config output_pins[ARRAY_LENGTH(macrocells)];
 	UINT16 index, output_pin_count;
 
 	output_pin_count = 0;
 
-	for (index = 0; index < ARRAY_LEN(output_pins); ++index)
+	for (index = 0; index < ARRAY_LENGTH(output_pins); ++index)
 	{
 		if (jed_get_fuse(jed, macrocells[index].s1_fuse))
 		{
@@ -5315,7 +5313,7 @@ static void config_gal18v10_pins(const pal_data* pal, const jed_data* jed)
 		}
 	}
 
-	set_input_pins(input_pins, ARRAY_LEN(input_pins));
+	set_input_pins(input_pins, ARRAY_LENGTH(input_pins));
 	set_output_pins(output_pins, output_pin_count);
 }
 
@@ -5355,7 +5353,7 @@ static void config_pal20l8_pins(const pal_data* pal, const jed_data* jed)
 		}
 	}
 
-	set_input_pins(input_pins, ARRAY_LEN(input_pins));
+	set_input_pins(input_pins, ARRAY_LENGTH(input_pins));
 	set_output_pins(output_pins, output_pin_count);
 }
 
@@ -5395,7 +5393,7 @@ static void config_pal20l10_pins(const pal_data* pal, const jed_data* jed)
 		}
 	}
 
-	set_input_pins(input_pins, ARRAY_LEN(input_pins));
+	set_input_pins(input_pins, ARRAY_LENGTH(input_pins));
 	set_output_pins(output_pins, output_pin_count);
 }
 
@@ -5431,7 +5429,7 @@ static void config_pal20r4_pins(const pal_data* pal, const jed_data* jed)
 		++output_pin_count;
 	}
 
-	for (index = 0; index < ARRAY_LEN(registered_pins); ++index)
+	for (index = 0; index < ARRAY_LENGTH(registered_pins); ++index)
 	{
 		output_pins[output_pin_count].pin = registered_pins[index];
 		output_pins[output_pin_count].flags = OUTPUT_ACTIVELOW | OUTPUT_REGISTERED | OUTPUT_FEEDBACK_REGISTERED;
@@ -5455,7 +5453,7 @@ static void config_pal20r4_pins(const pal_data* pal, const jed_data* jed)
 		++output_pin_count;
 	}
 
-	set_input_pins(input_pins, ARRAY_LEN(input_pins));
+	set_input_pins(input_pins, ARRAY_LENGTH(input_pins));
 	set_output_pins(output_pins, output_pin_count);
 }
 
@@ -5483,7 +5481,7 @@ static void config_pal20r6_pins(const pal_data* pal, const jed_data* jed)
 		++output_pin_count;
 	}
 
-	for (index = 0; index < ARRAY_LEN(registered_pins); ++index)
+	for (index = 0; index < ARRAY_LENGTH(registered_pins); ++index)
 	{
 		output_pins[output_pin_count].pin = registered_pins[index];
 		output_pins[output_pin_count].flags = OUTPUT_ACTIVELOW | OUTPUT_REGISTERED | OUTPUT_FEEDBACK_REGISTERED;
@@ -5499,7 +5497,7 @@ static void config_pal20r6_pins(const pal_data* pal, const jed_data* jed)
 		++output_pin_count;
 	}
 
-	set_input_pins(input_pins, ARRAY_LEN(input_pins));
+	set_input_pins(input_pins, ARRAY_LENGTH(input_pins));
 	set_output_pins(output_pins, output_pin_count);
 }
 
@@ -5523,8 +5521,8 @@ static void config_pal20r8_pins(const pal_data* pal, const jed_data* jed)
 		{21, OUTPUT_ACTIVELOW | OUTPUT_REGISTERED | OUTPUT_FEEDBACK_REGISTERED},
 		{22, OUTPUT_ACTIVELOW | OUTPUT_REGISTERED | OUTPUT_FEEDBACK_REGISTERED}};
 
-	set_input_pins(input_pins, ARRAY_LEN(input_pins));
-	set_output_pins(output_pins, ARRAY_LEN(output_pins));
+	set_input_pins(input_pins, ARRAY_LENGTH(input_pins));
+	set_output_pins(output_pins, ARRAY_LENGTH(output_pins));
 }
 
 
@@ -5549,8 +5547,8 @@ static void config_pal20x4_pins(const pal_data* pal, const jed_data* jed)
 		{22, OUTPUT_ACTIVELOW | OUTPUT_COMBINATORIAL | OUTPUT_FEEDBACK_OUTPUT},
 		{23, OUTPUT_ACTIVELOW | OUTPUT_COMBINATORIAL | OUTPUT_FEEDBACK_OUTPUT}};
 
-	set_input_pins(input_pins, ARRAY_LEN(input_pins));
-	set_output_pins(output_pins, ARRAY_LEN(output_pins));
+	set_input_pins(input_pins, ARRAY_LENGTH(input_pins));
+	set_output_pins(output_pins, ARRAY_LENGTH(output_pins));
 }
 
 /*-------------------------------------------------
@@ -5573,8 +5571,8 @@ static void config_pal20x8_pins(const pal_data* pal, const jed_data* jed)
 		{22, OUTPUT_ACTIVELOW | OUTPUT_REGISTERED | OUTPUT_FEEDBACK_REGISTERED},
 		{23, OUTPUT_ACTIVELOW | OUTPUT_COMBINATORIAL | OUTPUT_FEEDBACK_OUTPUT}};
 
-	set_input_pins(input_pins, ARRAY_LEN(input_pins));
-	set_output_pins(output_pins, ARRAY_LEN(output_pins));
+	set_input_pins(input_pins, ARRAY_LENGTH(input_pins));
+	set_output_pins(output_pins, ARRAY_LENGTH(output_pins));
 }
 
 
@@ -5599,8 +5597,8 @@ static void config_pal20x10_pins(const pal_data* pal, const jed_data* jed)
 		{22, OUTPUT_ACTIVELOW | OUTPUT_REGISTERED | OUTPUT_FEEDBACK_REGISTERED},
 		{23, OUTPUT_ACTIVELOW | OUTPUT_REGISTERED | OUTPUT_FEEDBACK_REGISTERED}};
 
-	set_input_pins(input_pins, ARRAY_LEN(input_pins));
-	set_output_pins(output_pins, ARRAY_LEN(output_pins));
+	set_input_pins(input_pins, ARRAY_LENGTH(input_pins));
+	set_output_pins(output_pins, ARRAY_LENGTH(output_pins));
 }
 
 
@@ -5638,7 +5636,7 @@ static void config_82s153_pls153_pins(const pal_data* pal, const jed_data* jed)
 		}
 	}
 
-	set_input_pins(input_pins, ARRAY_LEN(input_pins));
+	set_input_pins(input_pins, ARRAY_LENGTH(input_pins));
 	set_output_pins(output_pins, output_pin_count);
 }
 
@@ -5677,7 +5675,7 @@ static void config_ck2605_pins(const pal_data* pal, const jed_data* jed)
 		}
 	}
 
-	set_input_pins(input_pins, ARRAY_LEN(input_pins));
+	set_input_pins(input_pins, ARRAY_LENGTH(input_pins));
 	set_output_pins(output_pins, output_pin_count);
 }
 
@@ -5711,7 +5709,7 @@ static void config_epl10p8_pins(const pal_data* pal, const jed_data* jed)
 	pin_output_config output_pins[8];
 	UINT16 index;
 
-	for (index = 0; index < ARRAY_LEN(memory_cells); ++index)
+	for (index = 0; index < ARRAY_LENGTH(memory_cells); ++index)
 	{
 		output_pins[index].pin = memory_cells[index].pin;
 		output_pins[index].flags = OUTPUT_COMBINATORIAL | OUTPUT_FEEDBACK_NONE;
@@ -5726,8 +5724,8 @@ static void config_epl10p8_pins(const pal_data* pal, const jed_data* jed)
 		}
 	}
 
-	set_input_pins(input_pins, ARRAY_LEN(input_pins));
-	set_output_pins(output_pins, ARRAY_LEN(output_pins));
+	set_input_pins(input_pins, ARRAY_LENGTH(input_pins));
+	set_output_pins(output_pins, ARRAY_LENGTH(output_pins));
 }
 
 
@@ -5759,7 +5757,7 @@ static void config_epl12p6_pins(const pal_data* pal, const jed_data* jed)
 	pin_output_config output_pins[8];
 	UINT16 index;
 
-	for (index = 0; index < ARRAY_LEN(memory_cells); ++index)
+	for (index = 0; index < ARRAY_LENGTH(memory_cells); ++index)
 	{
 		output_pins[index].pin = memory_cells[index].pin;
 		output_pins[index].flags = OUTPUT_COMBINATORIAL | OUTPUT_FEEDBACK_NONE;
@@ -5774,8 +5772,8 @@ static void config_epl12p6_pins(const pal_data* pal, const jed_data* jed)
 		}
 	}
 
-	set_input_pins(input_pins, ARRAY_LEN(input_pins));
-	set_output_pins(output_pins, ARRAY_LEN(output_pins));
+	set_input_pins(input_pins, ARRAY_LENGTH(input_pins));
+	set_output_pins(output_pins, ARRAY_LENGTH(output_pins));
 }
 
 
@@ -5805,7 +5803,7 @@ static void config_epl14p4_pins(const pal_data* pal, const jed_data* jed)
 	pin_output_config output_pins[8];
 	UINT16 index;
 
-	for (index = 0; index < ARRAY_LEN(memory_cells); ++index)
+	for (index = 0; index < ARRAY_LENGTH(memory_cells); ++index)
 	{
 		output_pins[index].pin = memory_cells[index].pin;
 		output_pins[index].flags = OUTPUT_COMBINATORIAL | OUTPUT_FEEDBACK_NONE;
@@ -5820,8 +5818,8 @@ static void config_epl14p4_pins(const pal_data* pal, const jed_data* jed)
 		}
 	}
 
-	set_input_pins(input_pins, ARRAY_LEN(input_pins));
-	set_output_pins(output_pins, ARRAY_LEN(output_pins));
+	set_input_pins(input_pins, ARRAY_LENGTH(input_pins));
+	set_output_pins(output_pins, ARRAY_LENGTH(output_pins));
 }
 
 
@@ -5849,7 +5847,7 @@ static void config_epl16p2_pins(const pal_data* pal, const jed_data* jed)
 	pin_output_config output_pins[8];
 	UINT16 index;
 
-	for (index = 0; index < ARRAY_LEN(memory_cells); ++index)
+	for (index = 0; index < ARRAY_LENGTH(memory_cells); ++index)
 	{
 		output_pins[index].pin = memory_cells[index].pin;
 		output_pins[index].flags = OUTPUT_COMBINATORIAL | OUTPUT_FEEDBACK_NONE;
@@ -5864,8 +5862,8 @@ static void config_epl16p2_pins(const pal_data* pal, const jed_data* jed)
 		}
 	}
 
-	set_input_pins(input_pins, ARRAY_LEN(input_pins));
-	set_output_pins(output_pins, ARRAY_LEN(output_pins));
+	set_input_pins(input_pins, ARRAY_LENGTH(input_pins));
+	set_output_pins(output_pins, ARRAY_LENGTH(output_pins));
 }
 
 
@@ -5899,7 +5897,7 @@ static void config_epl16p8_pins(const pal_data* pal, const jed_data* jed)
 	pin_output_config output_pins[8];
 	UINT16 index;
 
-	for (index = 0; index < ARRAY_LEN(memory_cells); ++index)
+	for (index = 0; index < ARRAY_LENGTH(memory_cells); ++index)
 	{
 		output_pins[index].pin = memory_cells[index].pin;
 		output_pins[index].flags = OUTPUT_COMBINATORIAL | OUTPUT_FEEDBACK_NONE;
@@ -5914,8 +5912,8 @@ static void config_epl16p8_pins(const pal_data* pal, const jed_data* jed)
 		}
 	}
 
-	set_input_pins(input_pins, ARRAY_LEN(input_pins));
-	set_output_pins(output_pins, ARRAY_LEN(output_pins));
+	set_input_pins(input_pins, ARRAY_LENGTH(input_pins));
+	set_output_pins(output_pins, ARRAY_LENGTH(output_pins));
 }
 
 
@@ -5949,7 +5947,7 @@ static void config_epl16rp8_pins(const pal_data* pal, const jed_data* jed)
 	pin_output_config output_pins[8];
 	UINT16 index;
 
-	for (index = 0; index < ARRAY_LEN(memory_cells); ++index)
+	for (index = 0; index < ARRAY_LENGTH(memory_cells); ++index)
 	{
 		output_pins[index].pin = memory_cells[index].pin;
 		output_pins[index].flags = OUTPUT_REGISTERED | OUTPUT_FEEDBACK_REGISTERED;
@@ -5964,8 +5962,8 @@ static void config_epl16rp8_pins(const pal_data* pal, const jed_data* jed)
 		}
 	}
 
-	set_input_pins(input_pins, ARRAY_LEN(input_pins));
-	set_output_pins(output_pins, ARRAY_LEN(output_pins));
+	set_input_pins(input_pins, ARRAY_LENGTH(input_pins));
+	set_output_pins(output_pins, ARRAY_LENGTH(output_pins));
 }
 
 
@@ -5999,7 +5997,7 @@ static void config_epl16rp6_pins(const pal_data* pal, const jed_data* jed)
 	pin_output_config output_pins[8];
 	UINT16 index;
 
-	for (index = 0; index < ARRAY_LEN(memory_cells); ++index)
+	for (index = 0; index < ARRAY_LENGTH(memory_cells); ++index)
 	{
 		output_pins[index].pin = memory_cells[index].pin;
 
@@ -6024,8 +6022,8 @@ static void config_epl16rp6_pins(const pal_data* pal, const jed_data* jed)
 		}
 	}
 
-	set_input_pins(input_pins, ARRAY_LEN(input_pins));
-	set_output_pins(output_pins, ARRAY_LEN(output_pins));
+	set_input_pins(input_pins, ARRAY_LENGTH(input_pins));
+	set_output_pins(output_pins, ARRAY_LENGTH(output_pins));
 }
 
 
@@ -6059,7 +6057,7 @@ static void config_epl16rp4_pins(const pal_data* pal, const jed_data* jed)
 	pin_output_config output_pins[8];
 	UINT16 index;
 
-	for (index = 0; index < ARRAY_LEN(memory_cells); ++index)
+	for (index = 0; index < ARRAY_LENGTH(memory_cells); ++index)
 	{
 		output_pins[index].pin = memory_cells[index].pin;
 
@@ -6083,8 +6081,8 @@ static void config_epl16rp4_pins(const pal_data* pal, const jed_data* jed)
 		}
 	}
 
-	set_input_pins(input_pins, ARRAY_LEN(input_pins));
-	set_output_pins(output_pins, ARRAY_LEN(output_pins));
+	set_input_pins(input_pins, ARRAY_LENGTH(input_pins));
+	set_output_pins(output_pins, ARRAY_LENGTH(output_pins));
 }
 #endif
 
@@ -6101,7 +6099,7 @@ static void config_pal10p8_pins(const pal_data* pal, const jed_data* jed)
 	pin_output_config output_pins[8];
 	UINT16 index;
 
-	for (index = 0; index < ARRAY_LEN(output_pins); ++index)
+	for (index = 0; index < ARRAY_LENGTH(output_pins); ++index)
 	{
 		output_pins[index].pin = index + 12;
 		output_pins[index].flags = OUTPUT_COMBINATORIAL | OUTPUT_FEEDBACK_NONE;
@@ -6116,8 +6114,8 @@ static void config_pal10p8_pins(const pal_data* pal, const jed_data* jed)
 		}
 	}
 
-	set_input_pins(input_pins, ARRAY_LEN(input_pins));
-	set_output_pins(output_pins, ARRAY_LEN(output_pins));
+	set_input_pins(input_pins, ARRAY_LENGTH(input_pins));
+	set_output_pins(output_pins, ARRAY_LENGTH(output_pins));
 }
 
 
@@ -6133,7 +6131,7 @@ static void config_pal12p6_pins(const pal_data* pal, const jed_data* jed)
 	pin_output_config output_pins[6];
 	UINT16 index;
 
-	for (index = 0; index < ARRAY_LEN(output_pins); ++index)
+	for (index = 0; index < ARRAY_LENGTH(output_pins); ++index)
 	{
 		output_pins[index].pin = index + 13;
 		output_pins[index].flags = OUTPUT_COMBINATORIAL | OUTPUT_FEEDBACK_NONE;
@@ -6148,8 +6146,8 @@ static void config_pal12p6_pins(const pal_data* pal, const jed_data* jed)
 		}
 	}
 
-	set_input_pins(input_pins, ARRAY_LEN(input_pins));
-	set_output_pins(output_pins, ARRAY_LEN(output_pins));
+	set_input_pins(input_pins, ARRAY_LENGTH(input_pins));
+	set_output_pins(output_pins, ARRAY_LENGTH(output_pins));
 }
 
 
@@ -6165,7 +6163,7 @@ static void config_pal14p4_pins(const pal_data* pal, const jed_data* jed)
 	pin_output_config output_pins[4];
 	UINT16 index;
 
-	for (index = 0; index < ARRAY_LEN(output_pins); ++index)
+	for (index = 0; index < ARRAY_LENGTH(output_pins); ++index)
 	{
 		output_pins[index].pin = index + 14;
 		output_pins[index].flags = OUTPUT_COMBINATORIAL | OUTPUT_FEEDBACK_NONE;
@@ -6180,8 +6178,8 @@ static void config_pal14p4_pins(const pal_data* pal, const jed_data* jed)
 		}
 	}
 
-	set_input_pins(input_pins, ARRAY_LEN(input_pins));
-	set_output_pins(output_pins, ARRAY_LEN(output_pins));
+	set_input_pins(input_pins, ARRAY_LENGTH(input_pins));
+	set_output_pins(output_pins, ARRAY_LENGTH(output_pins));
 }
 
 
@@ -6197,7 +6195,7 @@ static void config_pal16p2_pins(const pal_data* pal, const jed_data* jed)
 	pin_output_config output_pins[2];
 	UINT16 index;
 
-	for (index = 0; index < ARRAY_LEN(output_pins); ++index)
+	for (index = 0; index < ARRAY_LENGTH(output_pins); ++index)
 	{
 		output_pins[index].pin = index + 15;
 		output_pins[index].flags = OUTPUT_COMBINATORIAL | OUTPUT_FEEDBACK_NONE;
@@ -6212,8 +6210,8 @@ static void config_pal16p2_pins(const pal_data* pal, const jed_data* jed)
 		}
 	}
 
-	set_input_pins(input_pins, ARRAY_LEN(input_pins));
-	set_output_pins(output_pins, ARRAY_LEN(output_pins));
+	set_input_pins(input_pins, ARRAY_LENGTH(input_pins));
+	set_output_pins(output_pins, ARRAY_LENGTH(output_pins));
 }
 
 
@@ -6251,7 +6249,7 @@ static void config_pal16p8_pins(const pal_data* pal, const jed_data* jed)
 		}
 	}
 
-	set_input_pins(input_pins, ARRAY_LEN(input_pins));
+	set_input_pins(input_pins, ARRAY_LENGTH(input_pins));
 	set_output_pins(output_pins, output_pin_count);
 }
 
@@ -6305,7 +6303,7 @@ static void config_pal16rp4_pins(const pal_data* pal, const jed_data* jed)
 		++output_pin_count;
 	}
 
-	for (index = 0; index < ARRAY_LEN(registered_pins); ++index)
+	for (index = 0; index < ARRAY_LENGTH(registered_pins); ++index)
 	{
 		output_pins[output_pin_count].pin = registered_pins[index];
 		output_pins[output_pin_count].flags = OUTPUT_REGISTERED | OUTPUT_FEEDBACK_REGISTERED;
@@ -6356,7 +6354,7 @@ static void config_pal16rp4_pins(const pal_data* pal, const jed_data* jed)
 		++output_pin_count;
 	}
 
-	set_input_pins(input_pins, ARRAY_LEN(input_pins));
+	set_input_pins(input_pins, ARRAY_LENGTH(input_pins));
 	set_output_pins(output_pins, output_pin_count);
 }
 
@@ -6393,7 +6391,7 @@ static void config_pal16rp6_pins(const pal_data* pal, const jed_data* jed)
 		++output_pin_count;
 	}
 
-	for (index = 0; index < ARRAY_LEN(registered_pins); ++index)
+	for (index = 0; index < ARRAY_LENGTH(registered_pins); ++index)
 	{
 		output_pins[output_pin_count].pin = registered_pins[index];
 		output_pins[output_pin_count].flags = OUTPUT_REGISTERED | OUTPUT_FEEDBACK_REGISTERED;
@@ -6427,7 +6425,7 @@ static void config_pal16rp6_pins(const pal_data* pal, const jed_data* jed)
 		++output_pin_count;
 	}
 
-	set_input_pins(input_pins, ARRAY_LEN(input_pins));
+	set_input_pins(input_pins, ARRAY_LENGTH(input_pins));
 	set_output_pins(output_pins, output_pin_count);
 }
 
@@ -6452,7 +6450,7 @@ static void config_pal16rp8_pins(const pal_data* pal, const jed_data* jed)
 		{19, OUTPUT_REGISTERED | OUTPUT_FEEDBACK_REGISTERED}};
 	UINT16 index;
 
-	for (index = 0; index < ARRAY_LEN(output_pins); ++index)
+	for (index = 0; index < ARRAY_LENGTH(output_pins); ++index)
 	{
 		if (!jed_get_fuse(jed, 2055 - index))
 		{
@@ -6464,8 +6462,8 @@ static void config_pal16rp8_pins(const pal_data* pal, const jed_data* jed)
 		}
 	}
 
-	set_input_pins(input_pins, ARRAY_LEN(input_pins));
-	set_output_pins(output_pins, ARRAY_LEN(output_pins));
+	set_input_pins(input_pins, ARRAY_LENGTH(input_pins));
+	set_output_pins(output_pins, ARRAY_LENGTH(output_pins));
 }
 
 
@@ -6496,8 +6494,8 @@ static void config_pal6l16_pins(const pal_data* pal, const jed_data* jed)
 		{22, OUTPUT_ACTIVELOW | OUTPUT_COMBINATORIAL | OUTPUT_FEEDBACK_NONE},
 		{23, OUTPUT_ACTIVELOW | OUTPUT_COMBINATORIAL | OUTPUT_FEEDBACK_NONE}};
 
-	set_input_pins(input_pins, ARRAY_LEN(input_pins));
-	set_output_pins(output_pins, ARRAY_LEN(output_pins));
+	set_input_pins(input_pins, ARRAY_LENGTH(input_pins));
+	set_output_pins(output_pins, ARRAY_LENGTH(output_pins));
 }
 
 
@@ -6526,8 +6524,8 @@ static void config_pal8l14_pins(const pal_data* pal, const jed_data* jed)
 		{22, OUTPUT_ACTIVELOW | OUTPUT_COMBINATORIAL | OUTPUT_FEEDBACK_NONE},
 		{23, OUTPUT_ACTIVELOW | OUTPUT_COMBINATORIAL | OUTPUT_FEEDBACK_NONE}};
 
-	set_input_pins(input_pins, ARRAY_LEN(input_pins));
-	set_output_pins(output_pins, ARRAY_LEN(output_pins));
+	set_input_pins(input_pins, ARRAY_LENGTH(input_pins));
+	set_output_pins(output_pins, ARRAY_LENGTH(output_pins));
 }
 
 
@@ -6552,8 +6550,8 @@ static void config_pal12h10_pins(const pal_data* pal, const jed_data* jed)
 		{22, OUTPUT_ACTIVEHIGH | OUTPUT_COMBINATORIAL | OUTPUT_FEEDBACK_NONE},
 		{23, OUTPUT_ACTIVEHIGH | OUTPUT_COMBINATORIAL | OUTPUT_FEEDBACK_NONE}};
 
-	set_input_pins(input_pins, ARRAY_LEN(input_pins));
-	set_output_pins(output_pins, ARRAY_LEN(output_pins));
+	set_input_pins(input_pins, ARRAY_LENGTH(input_pins));
+	set_output_pins(output_pins, ARRAY_LENGTH(output_pins));
 }
 
 
@@ -6578,8 +6576,8 @@ static void config_pal12l10_pins(const pal_data* pal, const jed_data* jed)
 		{22, OUTPUT_ACTIVELOW | OUTPUT_COMBINATORIAL | OUTPUT_FEEDBACK_NONE},
 		{23, OUTPUT_ACTIVELOW | OUTPUT_COMBINATORIAL | OUTPUT_FEEDBACK_NONE}};
 
-	set_input_pins(input_pins, ARRAY_LEN(input_pins));
-	set_output_pins(output_pins, ARRAY_LEN(output_pins));
+	set_input_pins(input_pins, ARRAY_LENGTH(input_pins));
+	set_output_pins(output_pins, ARRAY_LENGTH(output_pins));
 }
 
 
@@ -6602,8 +6600,8 @@ static void config_pal14h8_pins(const pal_data* pal, const jed_data* jed)
 		{21, OUTPUT_ACTIVEHIGH | OUTPUT_COMBINATORIAL | OUTPUT_FEEDBACK_NONE},
 		{22, OUTPUT_ACTIVEHIGH | OUTPUT_COMBINATORIAL | OUTPUT_FEEDBACK_NONE}};
 
-	set_input_pins(input_pins, ARRAY_LEN(input_pins));
-	set_output_pins(output_pins, ARRAY_LEN(output_pins));
+	set_input_pins(input_pins, ARRAY_LENGTH(input_pins));
+	set_output_pins(output_pins, ARRAY_LENGTH(output_pins));
 }
 
 
@@ -6626,8 +6624,8 @@ static void config_pal14l8_pins(const pal_data* pal, const jed_data* jed)
 		{21, OUTPUT_ACTIVELOW | OUTPUT_COMBINATORIAL | OUTPUT_FEEDBACK_NONE},
 		{22, OUTPUT_ACTIVELOW | OUTPUT_COMBINATORIAL | OUTPUT_FEEDBACK_NONE}};
 
-	set_input_pins(input_pins, ARRAY_LEN(input_pins));
-	set_output_pins(output_pins, ARRAY_LEN(output_pins));
+	set_input_pins(input_pins, ARRAY_LENGTH(input_pins));
+	set_output_pins(output_pins, ARRAY_LENGTH(output_pins));
 }
 
 
@@ -6648,8 +6646,8 @@ static void config_pal16h6_pins(const pal_data* pal, const jed_data* jed)
 		{20, OUTPUT_ACTIVEHIGH | OUTPUT_COMBINATORIAL | OUTPUT_FEEDBACK_NONE},
 		{21, OUTPUT_ACTIVEHIGH | OUTPUT_COMBINATORIAL | OUTPUT_FEEDBACK_NONE}};
 
-	set_input_pins(input_pins, ARRAY_LEN(input_pins));
-	set_output_pins(output_pins, ARRAY_LEN(output_pins));
+	set_input_pins(input_pins, ARRAY_LENGTH(input_pins));
+	set_output_pins(output_pins, ARRAY_LENGTH(output_pins));
 }
 
 
@@ -6670,8 +6668,8 @@ static void config_pal16l6_pins(const pal_data* pal, const jed_data* jed)
 		{20, OUTPUT_ACTIVELOW | OUTPUT_COMBINATORIAL | OUTPUT_FEEDBACK_NONE},
 		{21, OUTPUT_ACTIVELOW | OUTPUT_COMBINATORIAL | OUTPUT_FEEDBACK_NONE}};
 
-	set_input_pins(input_pins, ARRAY_LEN(input_pins));
-	set_output_pins(output_pins, ARRAY_LEN(output_pins));
+	set_input_pins(input_pins, ARRAY_LENGTH(input_pins));
+	set_output_pins(output_pins, ARRAY_LENGTH(output_pins));
 }
 
 
@@ -6690,8 +6688,8 @@ static void config_pal18h4_pins(const pal_data* pal, const jed_data* jed)
 		{19, OUTPUT_ACTIVEHIGH | OUTPUT_COMBINATORIAL | OUTPUT_FEEDBACK_NONE},
 		{20, OUTPUT_ACTIVEHIGH | OUTPUT_COMBINATORIAL | OUTPUT_FEEDBACK_NONE}};
 
-	set_input_pins(input_pins, ARRAY_LEN(input_pins));
-	set_output_pins(output_pins, ARRAY_LEN(output_pins));
+	set_input_pins(input_pins, ARRAY_LENGTH(input_pins));
+	set_output_pins(output_pins, ARRAY_LENGTH(output_pins));
 }
 
 
@@ -6710,8 +6708,8 @@ static void config_pal18l4_pins(const pal_data* pal, const jed_data* jed)
 		{19, OUTPUT_ACTIVELOW | OUTPUT_COMBINATORIAL | OUTPUT_FEEDBACK_NONE},
 		{20, OUTPUT_ACTIVELOW | OUTPUT_COMBINATORIAL | OUTPUT_FEEDBACK_NONE}};
 
-	set_input_pins(input_pins, ARRAY_LEN(input_pins));
-	set_output_pins(output_pins, ARRAY_LEN(output_pins));
+	set_input_pins(input_pins, ARRAY_LENGTH(input_pins));
+	set_output_pins(output_pins, ARRAY_LENGTH(output_pins));
 }
 
 
@@ -6728,8 +6726,8 @@ static void config_pal20c1_pins(const pal_data* pal, const jed_data* jed)
 		{18, OUTPUT_ACTIVELOW | OUTPUT_COMBINATORIAL | OUTPUT_FEEDBACK_NONE},
 		{19, OUTPUT_ACTIVEHIGH | OUTPUT_COMBINATORIAL | OUTPUT_FEEDBACK_NONE}};
 
-	set_input_pins(input_pins, ARRAY_LEN(input_pins));
-	set_output_pins(output_pins, ARRAY_LEN(output_pins));
+	set_input_pins(input_pins, ARRAY_LENGTH(input_pins));
+	set_output_pins(output_pins, ARRAY_LENGTH(output_pins));
 }
 
 
@@ -6746,8 +6744,8 @@ static void config_pal20l2_pins(const pal_data* pal, const jed_data* jed)
 		{18, OUTPUT_ACTIVELOW | OUTPUT_COMBINATORIAL | OUTPUT_FEEDBACK_NONE},
 		{19, OUTPUT_ACTIVELOW | OUTPUT_COMBINATORIAL | OUTPUT_FEEDBACK_NONE}};
 
-	set_input_pins(input_pins, ARRAY_LEN(input_pins));
-	set_output_pins(output_pins, ARRAY_LEN(output_pins));
+	set_input_pins(input_pins, ARRAY_LENGTH(input_pins));
+	set_output_pins(output_pins, ARRAY_LENGTH(output_pins));
 }
 
 
@@ -7213,7 +7211,7 @@ static int command_viewlist(int argc, char *argv[])
 		return print_usage();
 	}
 
-	for (index = 0; index < ARRAY_LEN(paldata); ++index)
+	for (index = 0; index < ARRAY_LENGTH(paldata); ++index)
 	{
 		printf("%s\n", paldata[index].name);
 	}
@@ -7239,7 +7237,7 @@ int main(int argc, char *argv[])
 		return print_usage();
 	}
 
-	for (index = 0; index < ARRAY_LEN(command_entries); ++index)
+	for (index = 0; index < ARRAY_LENGTH(command_entries); ++index)
 	{
 		if (!strcmp(argv[1], command_entries[index].command))
 			return command_entries[index].command_func(argc - 2, &argv[2]);