summaryrefslogtreecommitdiffstatshomepage
path: root/src/tools/jedutil.cpp
diff options
context:
space:
mode:
author AJR <ajrhacker@users.noreply.github.com>2021-02-14 11:05:57 -0500
committer AJR <ajrhacker@users.noreply.github.com>2021-02-14 11:05:57 -0500
commitbc0146c2038c46f789a246d5616afd7c425157f3 (patch)
treeb4d39194034b4c6e56ccd4035d25636034be43ca /src/tools/jedutil.cpp
parent91310bcdeb7ab0ff661738b212017bf836f4e8ad (diff)
Eliminate ARRAY_LENGTH template in favor of C++17's std::size
* osdcomm.h: Move definition of EQUIVALENT_ARRAY to coretmpl.h * sharc.cpp, gt64xxx.cpp, ym2413.cpp, gb_lcd.cpp, snes_ppu.cpp: Use STRUCT_MEMBER for save state registration * gio/newport.cpp, megadrive/svp.cpp, nes_ctrl/bcbattle.cpp, arm7.cpp, tms9995.cpp, pckeybrd.cpp, sa1110.cpp, sa1111.cpp, jangou_blitter.cpp, vic4567.cpp: Use std::fill(_n) instead of memset * emucore.h: Remove obsolete typedef
Diffstat (limited to 'src/tools/jedutil.cpp')
-rw-r--r--src/tools/jedutil.cpp584
1 files changed, 292 insertions, 292 deletions
diff --git a/src/tools/jedutil.cpp b/src/tools/jedutil.cpp
index 0c27c1b4480..34938561215 100644
--- a/src/tools/jedutil.cpp
+++ b/src/tools/jedutil.cpp
@@ -135,6 +135,7 @@
***************************************************************************/
+#include <cstdint>
#include <cstdio>
#include <cstdlib>
#include <cstring>
@@ -145,7 +146,6 @@
#include "corestr.h"
#include "jedparse.h"
-#include "osdcomm.h"
#include "plaparse.h"
@@ -2131,93 +2131,93 @@ static pin_fuse_columns _82s100_pls100_pinfusecolumns[] = {
static pal_data paldata[] = {
{"PAL10L8", 320,
- pal10l8pinfuserows, ARRAY_LENGTH(pal10l8pinfuserows),
- pal10l8pinfusecolumns, ARRAY_LENGTH(pal10l8pinfusecolumns),
+ pal10l8pinfuserows, std::size(pal10l8pinfuserows),
+ pal10l8pinfusecolumns, std::size(pal10l8pinfusecolumns),
print_pal10l8_product_terms,
config_pal10l8_pins,
nullptr,
nullptr},
{"PAL10H8", 320,
- pal10h8pinfuserows, ARRAY_LENGTH(pal10h8pinfuserows),
- pal10h8pinfusecolumns, ARRAY_LENGTH(pal10h8pinfusecolumns),
+ pal10h8pinfuserows, std::size(pal10h8pinfuserows),
+ pal10h8pinfusecolumns, std::size(pal10h8pinfusecolumns),
print_pal10h8_product_terms,
config_pal10h8_pins,
nullptr,
nullptr},
{"PAL12H6", 384,
- pal12h6pinfuserows, ARRAY_LENGTH(pal12h6pinfuserows),
- pal12h6pinfusecolumns, ARRAY_LENGTH(pal12h6pinfusecolumns),
+ pal12h6pinfuserows, std::size(pal12h6pinfuserows),
+ pal12h6pinfusecolumns, std::size(pal12h6pinfusecolumns),
print_pal12h6_product_terms,
config_pal12h6_pins,
nullptr,
nullptr},
{"PAL14H4", 448,
- pal14h4pinfuserows, ARRAY_LENGTH(pal14h4pinfuserows),
- pal14h4pinfusecolumns, ARRAY_LENGTH(pal14h4pinfusecolumns),
+ pal14h4pinfuserows, std::size(pal14h4pinfuserows),
+ pal14h4pinfusecolumns, std::size(pal14h4pinfusecolumns),
print_pal14h4_product_terms,
config_pal14h4_pins,
nullptr,
nullptr},
{"PAL16H2", 512,
- pal16h2pinfuserows, ARRAY_LENGTH(pal16h2pinfuserows),
- pal16h2pinfusecolumns, ARRAY_LENGTH(pal16h2pinfusecolumns),
+ pal16h2pinfuserows, std::size(pal16h2pinfuserows),
+ pal16h2pinfusecolumns, std::size(pal16h2pinfusecolumns),
print_pal16h2_product_terms,
config_pal16h2_pins,
nullptr,
nullptr},
{"PAL16C1", 512,
- pal16c1pinfuserows, ARRAY_LENGTH(pal16c1pinfuserows),
- pal16c1pinfusecolumns, ARRAY_LENGTH(pal16c1pinfusecolumns),
+ pal16c1pinfuserows, std::size(pal16c1pinfuserows),
+ pal16c1pinfusecolumns, std::size(pal16c1pinfusecolumns),
print_pal16c1_product_terms,
config_pal16c1_pins,
nullptr,
nullptr},
{"PAL12L6", 384,
- pal12l6pinfuserows, ARRAY_LENGTH(pal12l6pinfuserows),
- pal12l6pinfusecolumns, ARRAY_LENGTH(pal12l6pinfusecolumns),
+ pal12l6pinfuserows, std::size(pal12l6pinfuserows),
+ pal12l6pinfusecolumns, std::size(pal12l6pinfusecolumns),
print_pal12l6_product_terms,
config_pal12l6_pins,
nullptr,
nullptr},
{"PAL14L4", 448,
- pal14l4pinfuserows, ARRAY_LENGTH(pal14l4pinfuserows),
- pal14l4pinfusecolumns, ARRAY_LENGTH(pal14l4pinfusecolumns),
+ pal14l4pinfuserows, std::size(pal14l4pinfuserows),
+ pal14l4pinfusecolumns, std::size(pal14l4pinfusecolumns),
print_pal14l4_product_terms,
config_pal14l4_pins,
nullptr,
nullptr},
{"PAL16L2", 512,
- pal16l2pinfuserows, ARRAY_LENGTH(pal16l2pinfuserows),
- pal16l2pinfusecolumns, ARRAY_LENGTH(pal16l2pinfusecolumns),
+ pal16l2pinfuserows, std::size(pal16l2pinfuserows),
+ pal16l2pinfusecolumns, std::size(pal16l2pinfusecolumns),
print_pal16l2_product_terms,
config_pal16l2_pins,
nullptr,
nullptr},
/*{"15S8", 0, NULL, 0, NULL, 0, NULL, NULL, NULL, NULL},*/
{"PAL16L8", 2048,
- pal16l8pinfuserows, ARRAY_LENGTH(pal16l8pinfuserows),
- pal16l8pinfusecolumns, ARRAY_LENGTH(pal16l8pinfusecolumns),
+ pal16l8pinfuserows, std::size(pal16l8pinfuserows),
+ pal16l8pinfusecolumns, std::size(pal16l8pinfusecolumns),
print_pal16l8_product_terms,
config_pal16l8_pins,
nullptr,
nullptr},
{"PAL16R4", 2048,
- pal16r4pinfuserows, ARRAY_LENGTH(pal16r4pinfuserows),
- pal16r4pinfusecolumns, ARRAY_LENGTH(pal16r4pinfusecolumns),
+ pal16r4pinfuserows, std::size(pal16r4pinfuserows),
+ pal16r4pinfusecolumns, std::size(pal16r4pinfusecolumns),
print_pal16r4_product_terms,
config_pal16r4_pins,
nullptr,
nullptr},
{"PAL16R6", 2048,
- pal16r6pinfuserows, ARRAY_LENGTH(pal16r6pinfuserows),
- pal16r6pinfusecolumns, ARRAY_LENGTH(pal16r6pinfusecolumns),
+ pal16r6pinfuserows, std::size(pal16r6pinfuserows),
+ pal16r6pinfusecolumns, std::size(pal16r6pinfusecolumns),
print_pal16r6_product_terms,
config_pal16r6_pins,
nullptr,
nullptr},
{"PAL16R8", 2048,
- pal16r8pinfuserows, ARRAY_LENGTH(pal16r8pinfuserows),
- pal16r8pinfusecolumns, ARRAY_LENGTH(pal16r8pinfusecolumns),
+ pal16r8pinfuserows, std::size(pal16r8pinfuserows),
+ pal16r8pinfusecolumns, std::size(pal16r8pinfusecolumns),
print_pal16r8_product_terms,
config_pal16r8_pins,
nullptr,
@@ -2225,416 +2225,416 @@ static pal_data paldata[] = {
/*{"PAL16RA8", 0, NULL, 0, NULL, 0, NULL, NULL, NULL, NULL},
{"PAL16V8R", 0, NULL, 0, NULL, 0, NULL, NULL, NULL, NULL},*/ // PAL16V8 same fusemap as GAL16V8?
{"PALCE16V8", 2194,
- gal16v8pinfuserows, ARRAY_LENGTH(gal16v8pinfuserows),
- gal16v8pinfusecolumns, ARRAY_LENGTH(gal16v8pinfusecolumns),
+ gal16v8pinfuserows, std::size(gal16v8pinfuserows),
+ gal16v8pinfusecolumns, std::size(gal16v8pinfusecolumns),
print_gal16v8_product_terms,
config_gal16v8_pins,
nullptr,
nullptr},
{"GAL16V8", 2194,
- gal16v8pinfuserows, ARRAY_LENGTH(gal16v8pinfuserows),
- gal16v8pinfusecolumns, ARRAY_LENGTH(gal16v8pinfusecolumns),
+ gal16v8pinfuserows, std::size(gal16v8pinfuserows),
+ gal16v8pinfusecolumns, std::size(gal16v8pinfusecolumns),
print_gal16v8_product_terms,
config_gal16v8_pins,
is_gal16v8_product_term_enabled,
nullptr},
{"ATF16V8", 2194,
- gal16v8pinfuserows, ARRAY_LENGTH(gal16v8pinfuserows),
- gal16v8pinfusecolumns, ARRAY_LENGTH(gal16v8pinfusecolumns),
+ gal16v8pinfuserows, std::size(gal16v8pinfuserows),
+ gal16v8pinfusecolumns, std::size(gal16v8pinfusecolumns),
print_gal16v8_product_terms,
config_gal16v8_pins,
is_gal16v8_product_term_enabled,
nullptr},
{"18CV8", 2696,
- peel18cv8pinfuserows, ARRAY_LENGTH(peel18cv8pinfuserows),
- peel18cv8pinfusecolumns, ARRAY_LENGTH(peel18cv8pinfusecolumns),
+ peel18cv8pinfuserows, std::size(peel18cv8pinfuserows),
+ peel18cv8pinfusecolumns, std::size(peel18cv8pinfusecolumns),
print_peel18cv8_product_terms,
config_peel18cv8_pins,
nullptr,
get_peel18cv8_pin_fuse_state},
{"AMPAL18P8", 2600,
- ampal18p8pinfuserows, ARRAY_LENGTH(ampal18p8pinfuserows),
- ampal18p8pinfusecolumns, ARRAY_LENGTH(ampal18p8pinfusecolumns),
+ ampal18p8pinfuserows, std::size(ampal18p8pinfuserows),
+ ampal18p8pinfusecolumns, std::size(ampal18p8pinfusecolumns),
print_ampal18p8_product_terms,
config_ampal18p8_pins,
nullptr,
nullptr},
{"GAL18V10", 3540,
- gal18v10pinfuserows, ARRAY_LENGTH(gal18v10pinfuserows),
- gal18v10pinfusecolumns, ARRAY_LENGTH(gal18v10pinfusecolumns),
+ gal18v10pinfuserows, std::size(gal18v10pinfuserows),
+ gal18v10pinfusecolumns, std::size(gal18v10pinfusecolumns),
print_gal18v10_product_terms,
config_gal18v10_pins,
nullptr,
nullptr},
{"PAL20L8", 2560,
- pal20l8pinfuserows, ARRAY_LENGTH(pal20l8pinfuserows),
- pal20l8pinfusecolumns, ARRAY_LENGTH(pal20l8pinfusecolumns),
+ pal20l8pinfuserows, std::size(pal20l8pinfuserows),
+ pal20l8pinfusecolumns, std::size(pal20l8pinfusecolumns),
print_pal20l8_product_terms,
config_pal20l8_pins,
nullptr,
nullptr},
{"PAL20L10", 1600,
- pal20l10pinfuserows, ARRAY_LENGTH(pal20l10pinfuserows),
- pal20l10pinfusecolumns, ARRAY_LENGTH(pal20l10pinfusecolumns),
+ pal20l10pinfuserows, std::size(pal20l10pinfuserows),
+ pal20l10pinfusecolumns, std::size(pal20l10pinfusecolumns),
print_pal20l10_product_terms,
config_pal20l10_pins,
nullptr,
nullptr},
{"PAL20R4", 2560,
- pal20r4pinfuserows, ARRAY_LENGTH(pal20r4pinfuserows),
- pal20r4pinfusecolumns, ARRAY_LENGTH(pal20r4pinfusecolumns),
+ pal20r4pinfuserows, std::size(pal20r4pinfuserows),
+ pal20r4pinfusecolumns, std::size(pal20r4pinfusecolumns),
print_pal20r4_product_terms,
config_pal20r4_pins,
nullptr,
nullptr},
{"PAL20R6", 2560,
- pal20r6pinfuserows, ARRAY_LENGTH(pal20r6pinfuserows),
- pal20r6pinfusecolumns, ARRAY_LENGTH(pal20r6pinfusecolumns),
+ pal20r6pinfuserows, std::size(pal20r6pinfuserows),
+ pal20r6pinfusecolumns, std::size(pal20r6pinfusecolumns),
print_pal20r6_product_terms,
config_pal20r6_pins,
nullptr,
nullptr},
{"PAL20R8", 2560,
- pal20r8pinfuserows, ARRAY_LENGTH(pal20r8pinfuserows),
- pal20r8pinfusecolumns, ARRAY_LENGTH(pal20r8pinfusecolumns),
+ pal20r8pinfuserows, std::size(pal20r8pinfuserows),
+ pal20r8pinfusecolumns, std::size(pal20r8pinfusecolumns),
print_pal20r8_product_terms,
config_pal20r8_pins,
nullptr,
nullptr},
{"PAL20RA10", 3210,
- pal20ra10pinfuserows, ARRAY_LENGTH(pal20ra10pinfuserows),
- pal20ra10pinfusecolumns, ARRAY_LENGTH(pal20ra10pinfusecolumns),
+ pal20ra10pinfuserows, std::size(pal20ra10pinfuserows),
+ pal20ra10pinfusecolumns, std::size(pal20ra10pinfusecolumns),
print_pal20ra10_product_terms,
config_pal20ra10_pins,
nullptr,
nullptr },
{"PAL20X4", 1600,
- pal20x4pinfuserows, ARRAY_LENGTH(pal20x4pinfuserows),
- pal20x4pinfusecolumns, ARRAY_LENGTH(pal20x4pinfusecolumns),
+ pal20x4pinfuserows, std::size(pal20x4pinfuserows),
+ pal20x4pinfusecolumns, std::size(pal20x4pinfusecolumns),
print_pal20x4_product_terms,
config_pal20x4_pins,
nullptr,
nullptr},
{"PAL20X8", 1600,
- pal20x8pinfuserows, ARRAY_LENGTH(pal20x8pinfuserows),
- pal20x8pinfusecolumns, ARRAY_LENGTH(pal20x8pinfusecolumns),
+ pal20x8pinfuserows, std::size(pal20x8pinfuserows),
+ pal20x8pinfusecolumns, std::size(pal20x8pinfusecolumns),
print_pal20x8_product_terms,
config_pal20x8_pins,
nullptr,
nullptr},
{"PAL20X10", 1600,
- pal20x10pinfuserows, ARRAY_LENGTH(pal20x10pinfuserows),
- pal20x10pinfusecolumns, ARRAY_LENGTH(pal20x10pinfusecolumns),
+ pal20x10pinfuserows, std::size(pal20x10pinfuserows),
+ pal20x10pinfusecolumns, std::size(pal20x10pinfusecolumns),
print_pal20x10_product_terms,
config_pal20x10_pins,
nullptr,
nullptr},
{"GAL20V8", 2706,
- gal20v8pinfuserows, ARRAY_LENGTH(gal20v8pinfuserows),
- gal20v8pinfusecolumns, ARRAY_LENGTH(gal20v8pinfusecolumns),
+ gal20v8pinfuserows, std::size(gal20v8pinfuserows),
+ gal20v8pinfusecolumns, std::size(gal20v8pinfusecolumns),
print_gal20v8_product_terms,
config_gal20v8_pins,
is_gal20v8_product_term_enabled,
nullptr},
{"PALCE20V8", 2706,
- gal20v8pinfuserows, ARRAY_LENGTH(gal20v8pinfuserows),
- gal20v8pinfusecolumns, ARRAY_LENGTH(gal20v8pinfusecolumns),
+ gal20v8pinfuserows, std::size(gal20v8pinfuserows),
+ gal20v8pinfusecolumns, std::size(gal20v8pinfusecolumns),
print_gal20v8_product_terms,
config_gal20v8_pins,
is_gal20v8_product_term_enabled,
nullptr},
{"ATF20V10", 2706,
- gal20v8pinfuserows, ARRAY_LENGTH(gal20v8pinfuserows),
- gal20v8pinfusecolumns, ARRAY_LENGTH(gal20v8pinfusecolumns),
+ gal20v8pinfuserows, std::size(gal20v8pinfuserows),
+ gal20v8pinfusecolumns, std::size(gal20v8pinfusecolumns),
print_gal20v8_product_terms,
config_gal20v8_pins,
is_gal20v8_product_term_enabled,
nullptr},
{"PAL22V10", 5828,
- palce22v10_pal22v10pinfuserows, ARRAY_LENGTH(palce22v10_pal22v10pinfuserows),
- palce22v10_pal22v10pinfusecolumns, ARRAY_LENGTH(palce22v10_pal22v10pinfusecolumns),
+ palce22v10_pal22v10pinfuserows, std::size(palce22v10_pal22v10pinfuserows),
+ palce22v10_pal22v10pinfusecolumns, std::size(palce22v10_pal22v10pinfusecolumns),
print_palce22v10_pal22v10_product_terms,
config_palce22v10_pal22v10_pins,
nullptr,
nullptr},
{"PALCE22V10", 5828,
- palce22v10_pal22v10pinfuserows, ARRAY_LENGTH(palce22v10_pal22v10pinfuserows),
- palce22v10_pal22v10pinfusecolumns, ARRAY_LENGTH(palce22v10_pal22v10pinfusecolumns),
+ palce22v10_pal22v10pinfuserows, std::size(palce22v10_pal22v10pinfuserows),
+ palce22v10_pal22v10pinfusecolumns, std::size(palce22v10_pal22v10pinfusecolumns),
print_palce22v10_pal22v10_product_terms,
config_palce22v10_pal22v10_pins,
nullptr,
nullptr},
{"ATF22V10", 5828,
- palce22v10_pal22v10pinfuserows, ARRAY_LENGTH(palce22v10_pal22v10pinfuserows),
- palce22v10_pal22v10pinfusecolumns, ARRAY_LENGTH(palce22v10_pal22v10pinfusecolumns),
+ palce22v10_pal22v10pinfuserows, std::size(palce22v10_pal22v10pinfuserows),
+ palce22v10_pal22v10pinfusecolumns, std::size(palce22v10_pal22v10pinfusecolumns),
print_palce22v10_pal22v10_product_terms,
config_palce22v10_pal22v10_pins,
nullptr,
nullptr},
{"GAL22V10", 5892,
- gal22v10pinfuserows, ARRAY_LENGTH(gal22v10pinfuserows),
- gal22v10pinfusecolumns, ARRAY_LENGTH(gal22v10pinfusecolumns),
+ gal22v10pinfuserows, std::size(gal22v10pinfuserows),
+ gal22v10pinfusecolumns, std::size(gal22v10pinfusecolumns),
print_gal22v10_product_terms,
config_gal22v10_pins,
nullptr,
nullptr},
{"ATF22V10", 5892,
- gal22v10pinfuserows, ARRAY_LENGTH(gal22v10pinfuserows),
- gal22v10pinfusecolumns, ARRAY_LENGTH(gal22v10pinfusecolumns),
+ gal22v10pinfuserows, std::size(gal22v10pinfuserows),
+ gal22v10pinfusecolumns, std::size(gal22v10pinfusecolumns),
print_gal22v10_product_terms,
config_gal22v10_pins,
nullptr,
nullptr},
{"ATF22V10", 5893,
- atf22v10powerdownmodepinfuserows, ARRAY_LENGTH(atf22v10powerdownmodepinfuserows),
- atf22v10powerdownmodepinfusecolumns, ARRAY_LENGTH(atf22v10powerdownmodepinfusecolumns),
+ atf22v10powerdownmodepinfuserows, std::size(atf22v10powerdownmodepinfuserows),
+ atf22v10powerdownmodepinfusecolumns, std::size(atf22v10powerdownmodepinfusecolumns),
print_atf22v10_power_down_mode_product_terms,
config_atf22v10_power_down_mode_pins,
nullptr,
nullptr},
{"82S153", 1842,
- _82s153_pls153pinfuserows, ARRAY_LENGTH(_82s153_pls153pinfuserows),
- _82s153_pls153pinfusecolumns, ARRAY_LENGTH(_82s153_pls153pinfusecolumns),
+ _82s153_pls153pinfuserows, std::size(_82s153_pls153pinfuserows),
+ _82s153_pls153pinfusecolumns, std::size(_82s153_pls153pinfusecolumns),
print_82s153_pls153_product_terms,
config_82s153_pls153_pins,
nullptr,
nullptr},
{"PLS153", 1842,
- _82s153_pls153pinfuserows, ARRAY_LENGTH(_82s153_pls153pinfuserows),
- _82s153_pls153pinfusecolumns, ARRAY_LENGTH(_82s153_pls153pinfusecolumns),
+ _82s153_pls153pinfuserows, std::size(_82s153_pls153pinfuserows),
+ _82s153_pls153pinfusecolumns, std::size(_82s153_pls153pinfusecolumns),
print_82s153_pls153_product_terms,
config_82s153_pls153_pins,
nullptr,
nullptr},
{"CK2605", 1106,
- ck2605pinfuserows, ARRAY_LENGTH(ck2605pinfuserows),
- ck2605pinfusecolumns, ARRAY_LENGTH(ck2605pinfusecolumns),
+ ck2605pinfuserows, std::size(ck2605pinfuserows),
+ ck2605pinfusecolumns, std::size(ck2605pinfusecolumns),
print_ck2605_product_terms,
config_ck2605_pins,
nullptr,
nullptr},
#if defined(ricoh_pals)
{"EPL10P8", 664,
- epl10p8pinfuserows, ARRAY_LENGTH(epl10p8pinfuserows),
- epl10p8pinfusecolumns, ARRAY_LENGTH(epl10p8pinfusecolumns),
+ epl10p8pinfuserows, std::size(epl10p8pinfuserows),
+ epl10p8pinfusecolumns, std::size(epl10p8pinfusecolumns),
print_epl10p8_product_terms,
config_epl10p8_pins,
nullptr,
nullptr},
{"EPL12P6", 786,
- epl12p6pinfuserows, ARRAY_LENGTH(epl12p6pinfuserows),
- epl12p6pinfusecolumns, ARRAY_LENGTH(epl12p6pinfusecolumns),
+ epl12p6pinfuserows, std::size(epl12p6pinfuserows),
+ epl12p6pinfusecolumns, std::size(epl12p6pinfusecolumns),
print_epl12p6_product_terms,
config_epl12p6_pins,
nullptr,
nullptr},
{"EPL14P4", 908,
- epl14p4pinfuserows, ARRAY_LENGTH(epl14p4pinfuserows),
- epl14p4pinfusecolumns, ARRAY_LENGTH(epl14p4pinfusecolumns),
+ epl14p4pinfuserows, std::size(epl14p4pinfuserows),
+ epl14p4pinfusecolumns, std::size(epl14p4pinfusecolumns),
print_epl14p4_product_terms,
config_epl14p4_pins,
nullptr,
nullptr},
{"EPL16P2", 1030,
- epl16p2pinfuserows, ARRAY_LENGTH(epl16p2pinfuserows),
- epl16p2pinfusecolumns, ARRAY_LENGTH(epl16p2pinfusecolumns),
+ epl16p2pinfuserows, std::size(epl16p2pinfuserows),
+ epl16p2pinfusecolumns, std::size(epl16p2pinfusecolumns),
print_epl16p2_product_terms,
config_epl16p2_pins,
nullptr,
nullptr},
{"EPL16P8", 2072,
- epl16p8pinfuserows, ARRAY_LENGTH(epl16p8pinfuserows),
- epl16p8pinfusecolumns, ARRAY_LENGTH(epl16p8pinfusecolumns),
+ epl16p8pinfuserows, std::size(epl16p8pinfuserows),
+ epl16p8pinfusecolumns, std::size(epl16p8pinfusecolumns),
print_epl16p8_product_terms,
config_epl16p8_pins,
nullptr,
nullptr},
{"EPL16RP8", 2072,
- epl16rp8pinfuserows, ARRAY_LENGTH(epl16rp8pinfuserows),
- epl16rp8pinfusecolumns, ARRAY_LENGTH(epl16rp8pinfusecolumns),
+ epl16rp8pinfuserows, std::size(epl16rp8pinfuserows),
+ epl16rp8pinfusecolumns, std::size(epl16rp8pinfusecolumns),
print_epl16rp8_product_terms,
config_epl16rp8_pins,
nullptr,
nullptr},
{"EPL16RP6", 2072,
- epl16rp6pinfuserows, ARRAY_LENGTH(epl16rp6pinfuserows),
- epl16rp6pinfusecolumns, ARRAY_LENGTH(epl16rp6pinfusecolumns),
+ epl16rp6pinfuserows, std::size(epl16rp6pinfuserows),
+ epl16rp6pinfusecolumns, std::size(epl16rp6pinfusecolumns),
print_epl16rp6_product_terms,
config_epl16rp6_pins,
nullptr,
nullptr},
{"EPL16RP4", 2072,
- epl16rp4pinfuserows, ARRAY_LENGTH(epl16rp4pinfuserows),
- epl16rp4pinfusecolumns, ARRAY_LENGTH(epl16rp4pinfusecolumns),
+ epl16rp4pinfuserows, std::size(epl16rp4pinfuserows),
+ epl16rp4pinfusecolumns, std::size(epl16rp4pinfusecolumns),
print_epl16rp4_product_terms,
config_epl16rp4_pins,
nullptr,
nullptr},
#endif
{"PAL10P8", 328,
- pal10p8pinfuserows, ARRAY_LENGTH(pal10p8pinfuserows),
- pal10p8pinfusecolumns, ARRAY_LENGTH(pal10p8pinfusecolumns),
+ pal10p8pinfuserows, std::size(pal10p8pinfuserows),
+ pal10p8pinfusecolumns, std::size(pal10p8pinfusecolumns),
print_pal10p8_product_terms,
config_pal10p8_pins,
nullptr,
nullptr},
{"PAL12P6", 390,
- pal12p6pinfuserows, ARRAY_LENGTH(pal12p6pinfuserows),
- pal12p6pinfusecolumns, ARRAY_LENGTH(pal12p6pinfusecolumns),
+ pal12p6pinfuserows, std::size(pal12p6pinfuserows),
+ pal12p6pinfusecolumns, std::size(pal12p6pinfusecolumns),
print_pal12p6_product_terms,
config_pal12p6_pins,
nullptr,
nullptr},
{"PAL14P4", 452,
- pal14p4pinfuserows, ARRAY_LENGTH(pal14p4pinfuserows),
- pal14p4pinfusecolumns, ARRAY_LENGTH(pal14p4pinfusecolumns),
+ pal14p4pinfuserows, std::size(pal14p4pinfuserows),
+ pal14p4pinfusecolumns, std::size(pal14p4pinfusecolumns),
print_pal14p4_product_terms,
config_pal14p4_pins,
nullptr,
nullptr},
{"PAL16P2", 514,
- pal16p2pinfuserows, ARRAY_LENGTH(pal16p2pinfuserows),
- pal16p2pinfusecolumns, ARRAY_LENGTH(pal16p2pinfusecolumns),
+ pal16p2pinfuserows, std::size(pal16p2pinfuserows),
+ pal16p2pinfusecolumns, std::size(pal16p2pinfusecolumns),
print_pal16p2_product_terms,
config_pal16p2_pins,
nullptr,
nullptr},
{"PAL16P8", 2056,
- pal16p8pinfuserows, ARRAY_LENGTH(pal16p8pinfuserows),
- pal16p8pinfusecolumns, ARRAY_LENGTH(pal16p8pinfusecolumns),
+ pal16p8pinfuserows, std::size(pal16p8pinfuserows),
+ pal16p8pinfusecolumns, std::size(pal16p8pinfusecolumns),
print_pal16p8_product_terms,
config_pal16p8_pins,
nullptr,
nullptr},
{"PAL16RP4", 2056,
- pal16rp4pinfuserows, ARRAY_LENGTH(pal16rp4pinfuserows),
- pal16rp4pinfusecolumns, ARRAY_LENGTH(pal16rp4pinfusecolumns),
+ pal16rp4pinfuserows, std::size(pal16rp4pinfuserows),
+ pal16rp4pinfusecolumns, std::size(pal16rp4pinfusecolumns),
print_pal16rp4_product_terms,
config_pal16rp4_pins,
nullptr,
nullptr},
{"PAL16RP6", 2056,
- pal16rp6pinfuserows, ARRAY_LENGTH(pal16rp6pinfuserows),
- pal16rp6pinfusecolumns, ARRAY_LENGTH(pal16rp6pinfusecolumns),
+ pal16rp6pinfuserows, std::size(pal16rp6pinfuserows),
+ pal16rp6pinfusecolumns, std::size(pal16rp6pinfusecolumns),
print_pal16rp6_product_terms,
config_pal16rp6_pins,
nullptr,
nullptr},
{"PAL16RP8", 2056,
- pal16rp8pinfuserows, ARRAY_LENGTH(pal16rp8pinfuserows),
- pal16rp8pinfusecolumns, ARRAY_LENGTH(pal16rp8pinfusecolumns),
+ pal16rp8pinfuserows, std::size(pal16rp8pinfuserows),
+ pal16rp8pinfusecolumns, std::size(pal16rp8pinfusecolumns),
print_pal16rp8_product_terms,
config_pal16rp8_pins,
nullptr,
nullptr},
{"PAL6L16", 192,
- pal6l16pinfuserows, ARRAY_LENGTH(pal6l16pinfuserows),
- pal6l16pinfusecolumns, ARRAY_LENGTH(pal6l16pinfusecolumns),
+ pal6l16pinfuserows, std::size(pal6l16pinfuserows),
+ pal6l16pinfusecolumns, std::size(pal6l16pinfusecolumns),
print_pal6l16_product_terms,
config_pal6l16_pins,
nullptr,
nullptr},
{"PAL8L14", 224,
- pal8l14pinfuserows, ARRAY_LENGTH(pal8l14pinfuserows),
- pal8l14pinfusecolumns, ARRAY_LENGTH(pal8l14pinfusecolumns),
+ pal8l14pinfuserows, std::size(pal8l14pinfuserows),
+ pal8l14pinfusecolumns, std::size(pal8l14pinfusecolumns),
print_pal8l14_product_terms,
config_pal8l14_pins,
nullptr,
nullptr},
{"PAL12H10", 480,
- pal12h10pinfuserows, ARRAY_LENGTH(pal12h10pinfuserows),
- pal12h10pinfusecolumns, ARRAY_LENGTH(pal12h10pinfusecolumns),
+ pal12h10pinfuserows, std::size(pal12h10pinfuserows),
+ pal12h10pinfusecolumns, std::size(pal12h10pinfusecolumns),
print_pal12h10_product_terms,
config_pal12h10_pins,
nullptr,
nullptr},
{"PAL12L10", 480,
- pal12l10pinfuserows, ARRAY_LENGTH(pal12l10pinfuserows),
- pal12l10pinfusecolumns, ARRAY_LENGTH(pal12l10pinfusecolumns),
+ pal12l10pinfuserows, std::size(pal12l10pinfuserows),
+ pal12l10pinfusecolumns, std::size(pal12l10pinfusecolumns),
print_pal12l10_product_terms,
config_pal12l10_pins,
nullptr,
nullptr},
{"PAL14H8", 560,
- pal14h8pinfuserows, ARRAY_LENGTH(pal14h8pinfuserows),
- pal14h8pinfusecolumns, ARRAY_LENGTH(pal14h8pinfusecolumns),
+ pal14h8pinfuserows, std::size(pal14h8pinfuserows),
+ pal14h8pinfusecolumns, std::size(pal14h8pinfusecolumns),
print_pal14h8_product_terms,
config_pal14h8_pins,
nullptr,
nullptr},
{"PAL14L8", 560,
- pal14l8pinfuserows, ARRAY_LENGTH(pal14l8pinfuserows),
- pal14l8pinfusecolumns, ARRAY_LENGTH(pal14l8pinfusecolumns),
+ pal14l8pinfuserows, std::size(pal14l8pinfuserows),
+ pal14l8pinfusecolumns, std::size(pal14l8pinfusecolumns),
print_pal14l8_product_terms,
config_pal14l8_pins,
nullptr,
nullptr},
{"PAL16H6", 640,
- pal16h6pinfuserows, ARRAY_LENGTH(pal16h6pinfuserows),
- pal16h6pinfusecolumns, ARRAY_LENGTH(pal16h6pinfusecolumns),
+ pal16h6pinfuserows, std::size(pal16h6pinfuserows),
+ pal16h6pinfusecolumns, std::size(pal16h6pinfusecolumns),
print_pal16h6_product_terms,
config_pal16h6_pins,
nullptr,
nullptr},
{"PAL16L6", 640,
- pal16l6pinfuserows, ARRAY_LENGTH(pal16l6pinfuserows),
- pal16l6pinfusecolumns, ARRAY_LENGTH(pal16l6pinfusecolumns),
+ pal16l6pinfuserows, std::size(pal16l6pinfuserows),
+ pal16l6pinfusecolumns, std::size(pal16l6pinfusecolumns),
print_pal16l6_product_terms,
config_pal16l6_pins,
nullptr,
nullptr},
{"PAL18H4", 720,
- pal18h4pinfuserows, ARRAY_LENGTH(pal18h4pinfuserows),
- pal18h4pinfusecolumns, ARRAY_LENGTH(pal18h4pinfusecolumns),
+ pal18h4pinfuserows, std::size(pal18h4pinfuserows),
+ pal18h4pinfusecolumns, std::size(pal18h4pinfusecolumns),
print_pal18h4_product_terms,
config_pal18h4_pins,
nullptr,
nullptr},
{"PAL18L4", 720,
- pal18l4pinfuserows, ARRAY_LENGTH(pal18l4pinfuserows),
- pal18l4pinfusecolumns, ARRAY_LENGTH(pal18l4pinfusecolumns),
+ pal18l4pinfuserows, std::size(pal18l4pinfuserows),
+ pal18l4pinfusecolumns, std::size(pal18l4pinfusecolumns),
print_pal18l4_product_terms,
config_pal18l4_pins,
nullptr,
nullptr},
{"PAL20C1", 640,
- pal20c1pinfuserows, ARRAY_LENGTH(pal20c1pinfuserows),
- pal20c1pinfusecolumns, ARRAY_LENGTH(pal20c1pinfusecolumns),
+ pal20c1pinfuserows, std::size(pal20c1pinfuserows),
+ pal20c1pinfusecolumns, std::size(pal20c1pinfusecolumns),
print_pal20c1_product_terms,
config_pal20c1_pins,
nullptr,
nullptr},
{"PAL20L2", 640,
- pal20l2pinfuserows, ARRAY_LENGTH(pal20l2pinfuserows),
- pal20l2pinfusecolumns, ARRAY_LENGTH(pal20l2pinfusecolumns),
+ pal20l2pinfuserows, std::size(pal20l2pinfuserows),
+ pal20l2pinfusecolumns, std::size(pal20l2pinfusecolumns),
print_pal20l2_product_terms,
config_pal20l2_pins,
nullptr,
nullptr},
{"82S100", 1928,
- _82s100_pls100_pinfuserows, ARRAY_LENGTH(_82s100_pls100_pinfuserows),
- _82s100_pls100_pinfusecolumns, ARRAY_LENGTH(_82s100_pls100_pinfusecolumns),
+ _82s100_pls100_pinfuserows, std::size(_82s100_pls100_pinfuserows),
+ _82s100_pls100_pinfusecolumns, std::size(_82s100_pls100_pinfusecolumns),
print_82s100_pls100_product_terms,
config_82s100_pls100_pins,
nullptr,
nullptr},
{"PLS100", 1928,
- _82s100_pls100_pinfuserows, ARRAY_LENGTH(_82s100_pls100_pinfuserows),
- _82s100_pls100_pinfusecolumns, ARRAY_LENGTH(_82s100_pls100_pinfusecolumns),
+ _82s100_pls100_pinfuserows, std::size(_82s100_pls100_pinfuserows),
+ _82s100_pls100_pinfusecolumns, std::size(_82s100_pls100_pinfusecolumns),
print_82s100_pls100_product_terms,
config_82s100_pls100_pins,
nullptr,
nullptr},
{"82S101", 1928,
- _82s100_pls100_pinfuserows, ARRAY_LENGTH(_82s100_pls100_pinfuserows),
- _82s100_pls100_pinfusecolumns, ARRAY_LENGTH(_82s100_pls100_pinfusecolumns),
+ _82s100_pls100_pinfuserows, std::size(_82s100_pls100_pinfuserows),
+ _82s100_pls100_pinfusecolumns, std::size(_82s100_pls100_pinfusecolumns),
print_82s100_pls100_product_terms,
config_82s100_pls100_pins,
nullptr,
nullptr},
{"PLS101", 1928,
- _82s100_pls100_pinfuserows, ARRAY_LENGTH(_82s100_pls100_pinfuserows),
- _82s100_pls100_pinfusecolumns, ARRAY_LENGTH(_82s100_pls100_pinfusecolumns),
+ _82s100_pls100_pinfuserows, std::size(_82s100_pls100_pinfuserows),
+ _82s100_pls100_pinfusecolumns, std::size(_82s100_pls100_pinfusecolumns),
print_82s100_pls100_product_terms,
config_82s100_pls100_pins,
nullptr,
@@ -2693,7 +2693,7 @@ static void find_pal_data(const char *name, pal_data_vector& pal_data_vector)
{
int index;
- for (index = 0; index < ARRAY_LENGTH(paldata); ++index)
+ for (index = 0; index < std::size(paldata); ++index)
{
if (!core_stricmp(name, paldata[index].name))
{
@@ -4217,7 +4217,7 @@ static void print_epl10p8_product_terms(const pal_data* pal, const jed_data* jed
printf("Equations:\n\n");
- for (index = 0; index < ARRAY_LENGTH(memory_cells); ++index)
+ for (index = 0; index < std::size(memory_cells); ++index)
{
flags = outputpins[index].flags;
@@ -4767,8 +4767,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_LENGTH(input_pins));
- set_output_pins(output_pins, ARRAY_LENGTH(output_pins));
+ set_input_pins(input_pins, std::size(input_pins));
+ set_output_pins(output_pins, std::size(output_pins));
}
@@ -4791,8 +4791,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_LENGTH(input_pins));
- set_output_pins(output_pins, ARRAY_LENGTH(output_pins));
+ set_input_pins(input_pins, std::size(input_pins));
+ set_output_pins(output_pins, std::size(output_pins));
}
@@ -4813,8 +4813,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_LENGTH(input_pins));
- set_output_pins(output_pins, ARRAY_LENGTH(output_pins));
+ set_input_pins(input_pins, std::size(input_pins));
+ set_output_pins(output_pins, std::size(output_pins));
}
@@ -4835,8 +4835,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_LENGTH(input_pins));
- set_output_pins(output_pins, ARRAY_LENGTH(output_pins));
+ set_input_pins(input_pins, std::size(input_pins));
+ set_output_pins(output_pins, std::size(output_pins));
}
@@ -4855,8 +4855,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_LENGTH(input_pins));
- set_output_pins(output_pins, ARRAY_LENGTH(output_pins));
+ set_input_pins(input_pins, std::size(input_pins));
+ set_output_pins(output_pins, std::size(output_pins));
}
@@ -4875,8 +4875,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_LENGTH(input_pins));
- set_output_pins(output_pins, ARRAY_LENGTH(output_pins));
+ set_input_pins(input_pins, std::size(input_pins));
+ set_output_pins(output_pins, std::size(output_pins));
}
@@ -4893,8 +4893,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_LENGTH(input_pins));
- set_output_pins(output_pins, ARRAY_LENGTH(output_pins));
+ set_input_pins(input_pins, std::size(input_pins));
+ set_output_pins(output_pins, std::size(output_pins));
}
@@ -4911,8 +4911,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_LENGTH(input_pins));
- set_output_pins(output_pins, ARRAY_LENGTH(output_pins));
+ set_input_pins(input_pins, std::size(input_pins));
+ set_output_pins(output_pins, std::size(output_pins));
}
@@ -4929,8 +4929,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_LENGTH(input_pins));
- set_output_pins(output_pins, ARRAY_LENGTH(output_pins));
+ set_input_pins(input_pins, std::size(input_pins));
+ set_output_pins(output_pins, std::size(output_pins));
}
@@ -4959,7 +4959,7 @@ static void config_pal16l8_pins(const pal_data* pal, const jed_data* jed)
}
}
- set_input_pins(input_pins, ARRAY_LENGTH(input_pins));
+ set_input_pins(input_pins, std::size(input_pins));
set_output_pins(output_pins, output_pin_count);
}
@@ -4995,7 +4995,7 @@ static void config_pal16r4_pins(const pal_data* pal, const jed_data* jed)
++output_pin_count;
}
- for (index = 0; index < ARRAY_LENGTH(registered_pins); ++index)
+ for (index = 0; index < std::size(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;
@@ -5019,7 +5019,7 @@ static void config_pal16r4_pins(const pal_data* pal, const jed_data* jed)
++output_pin_count;
}
- set_input_pins(input_pins, ARRAY_LENGTH(input_pins));
+ set_input_pins(input_pins, std::size(input_pins));
set_output_pins(output_pins, output_pin_count);
}
@@ -5047,7 +5047,7 @@ static void config_pal16r6_pins(const pal_data* pal, const jed_data* jed)
++output_pin_count;
}
- for (index = 0; index < ARRAY_LENGTH(registered_pins); ++index)
+ for (index = 0; index < std::size(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;
@@ -5063,7 +5063,7 @@ static void config_pal16r6_pins(const pal_data* pal, const jed_data* jed)
++output_pin_count;
}
- set_input_pins(input_pins, ARRAY_LENGTH(input_pins));
+ set_input_pins(input_pins, std::size(input_pins));
set_output_pins(output_pins, output_pin_count);
}
@@ -5087,8 +5087,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_LENGTH(input_pins));
- set_output_pins(output_pins, ARRAY_LENGTH(output_pins));
+ set_input_pins(input_pins, std::size(input_pins));
+ set_output_pins(output_pins, std::size(output_pins));
}
@@ -5198,7 +5198,7 @@ static void config_gal16v8_pins(const pal_data* pal, const jed_data* jed)
static uint16_t input_pins_registered[] = {2, 3, 4, 5, 6, 7, 8, 9, 12, 13, 14, 15, 16, 17, 18, 19};
static uint16_t input_pins_combinatorialcomplex[] = {1, 2, 3, 4, 5, 6, 7, 8, 9, 11, 13, 14, 15, 16, 17, 18};
uint16_t input_pins_combinatorialsimple[18];
- pin_output_config output_pins[ARRAY_LENGTH(macrocells)];
+ pin_output_config output_pins[std::size(macrocells)];
uint16_t index, input_pin_count, output_pin_count;
output_pin_count = 0;
@@ -5214,12 +5214,12 @@ static void config_gal16v8_pins(const pal_data* pal, const jed_data* jed)
{
/* Complex Mode */
- set_input_pins(input_pins_combinatorialcomplex, ARRAY_LENGTH(input_pins_combinatorialcomplex));
+ set_input_pins(input_pins_combinatorialcomplex, std::size(input_pins_combinatorialcomplex));
memcpy(gal16v8pinfuserows, pinfuserows_combinatorialcomplex, sizeof(pinfuserows_combinatorialcomplex));
memcpy(gal16v8pinfusecolumns, pinfusecolumns_combinatorialcomplex, sizeof(pinfusecolumns_combinatorialcomplex));
- for (index = 0; index < ARRAY_LENGTH(macrocells); ++index)
+ for (index = 0; index < std::size(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))
@@ -5270,7 +5270,7 @@ static void config_gal16v8_pins(const pal_data* pal, const jed_data* jed)
memcpy(gal16v8pinfuserows, pinfuserows_combinatorialsimple, sizeof(pinfuserows_combinatorialsimple));
memcpy(gal16v8pinfusecolumns, pinfusecolumns_combinatorialsimple, sizeof(pinfusecolumns_combinatorialsimple));
- for (index = 0; index < ARRAY_LENGTH(macrocells); ++index)
+ for (index = 0; index < std::size(macrocells); ++index)
{
if (jed_get_fuse(jed, macrocells[index].ac1_fuse))
{
@@ -5325,11 +5325,11 @@ static void config_gal16v8_pins(const pal_data* pal, const jed_data* jed)
{
/* Registered */
- set_input_pins(input_pins_registered, ARRAY_LENGTH(input_pins_registered));
+ set_input_pins(input_pins_registered, std::size(input_pins_registered));
memcpy(gal16v8pinfusecolumns, pinfusecolumns_registered, sizeof(pinfusecolumns_registered));
- for (index = 0; index < ARRAY_LENGTH(macrocells); ++index)
+ for (index = 0; index < std::size(macrocells); ++index)
{
if (jed_get_fuse(jed, macrocells[index].ac1_fuse))
{
@@ -5414,14 +5414,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_t 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_LENGTH(macrocells)];
+ pin_output_config output_pins[std::size(macrocells)];
uint16_t index, output_pin_count;
- set_input_pins(input_pins, ARRAY_LENGTH(input_pins));
+ set_input_pins(input_pins, std::size(input_pins));
output_pin_count = 0;
- for (index = 0; index < ARRAY_LENGTH(macrocells); ++index)
+ for (index = 0; index < std::size(macrocells); ++index)
{
if (jed_get_fuse(jed, macrocells[index].feedback1_fuse) &&
!jed_get_fuse(jed, macrocells[index].feedback2_fuse))
@@ -5536,7 +5536,7 @@ static void config_ampal18p8_pins(const pal_data* pal, const jed_data* jed)
pin_output_config output_pins[8];
uint16_t index, output_pin_count;
- set_input_pins(input_pins, ARRAY_LENGTH(input_pins));
+ set_input_pins(input_pins, std::size(input_pins));
output_pin_count = 0;
@@ -5592,12 +5592,12 @@ static void config_gal18v10_pins(const pal_data* pal, const jed_data* jed)
{18, 3458, 3459},
{19, 3456, 3457}};
static uint16_t 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_LENGTH(macrocells)];
+ pin_output_config output_pins[std::size(macrocells)];
uint16_t index, output_pin_count;
output_pin_count = 0;
- for (index = 0; index < ARRAY_LENGTH(output_pins); ++index)
+ for (index = 0; index < std::size(output_pins); ++index)
{
if (jed_get_fuse(jed, macrocells[index].s1_fuse))
{
@@ -5640,7 +5640,7 @@ static void config_gal18v10_pins(const pal_data* pal, const jed_data* jed)
}
}
- set_input_pins(input_pins, ARRAY_LENGTH(input_pins));
+ set_input_pins(input_pins, std::size(input_pins));
set_output_pins(output_pins, output_pin_count);
}
@@ -5680,7 +5680,7 @@ static void config_pal20l8_pins(const pal_data* pal, const jed_data* jed)
}
}
- set_input_pins(input_pins, ARRAY_LENGTH(input_pins));
+ set_input_pins(input_pins, std::size(input_pins));
set_output_pins(output_pins, output_pin_count);
}
@@ -5720,7 +5720,7 @@ static void config_pal20l10_pins(const pal_data* pal, const jed_data* jed)
}
}
- set_input_pins(input_pins, ARRAY_LENGTH(input_pins));
+ set_input_pins(input_pins, std::size(input_pins));
set_output_pins(output_pins, output_pin_count);
}
@@ -5756,7 +5756,7 @@ static void config_pal20r4_pins(const pal_data* pal, const jed_data* jed)
++output_pin_count;
}
- for (index = 0; index < ARRAY_LENGTH(registered_pins); ++index)
+ for (index = 0; index < std::size(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;
@@ -5780,7 +5780,7 @@ static void config_pal20r4_pins(const pal_data* pal, const jed_data* jed)
++output_pin_count;
}
- set_input_pins(input_pins, ARRAY_LENGTH(input_pins));
+ set_input_pins(input_pins, std::size(input_pins));
set_output_pins(output_pins, output_pin_count);
}
@@ -5808,7 +5808,7 @@ static void config_pal20r6_pins(const pal_data* pal, const jed_data* jed)
++output_pin_count;
}
- for (index = 0; index < ARRAY_LENGTH(registered_pins); ++index)
+ for (index = 0; index < std::size(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;
@@ -5824,7 +5824,7 @@ static void config_pal20r6_pins(const pal_data* pal, const jed_data* jed)
++output_pin_count;
}
- set_input_pins(input_pins, ARRAY_LENGTH(input_pins));
+ set_input_pins(input_pins, std::size(input_pins));
set_output_pins(output_pins, output_pin_count);
}
@@ -5848,8 +5848,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_LENGTH(input_pins));
- set_output_pins(output_pins, ARRAY_LENGTH(output_pins));
+ set_input_pins(input_pins, std::size(input_pins));
+ set_output_pins(output_pins, std::size(output_pins));
}
@@ -5874,8 +5874,8 @@ static void config_pal20ra10_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_LENGTH(input_pins));
- set_output_pins(output_pins, ARRAY_LENGTH(output_pins));
+ set_input_pins(input_pins, std::size(input_pins));
+ set_output_pins(output_pins, std::size(output_pins));
}
@@ -5900,8 +5900,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_LENGTH(input_pins));
- set_output_pins(output_pins, ARRAY_LENGTH(output_pins));
+ set_input_pins(input_pins, std::size(input_pins));
+ set_output_pins(output_pins, std::size(output_pins));
}
/*-------------------------------------------------
@@ -5924,8 +5924,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_LENGTH(input_pins));
- set_output_pins(output_pins, ARRAY_LENGTH(output_pins));
+ set_input_pins(input_pins, std::size(input_pins));
+ set_output_pins(output_pins, std::size(output_pins));
}
@@ -5950,8 +5950,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_LENGTH(input_pins));
- set_output_pins(output_pins, ARRAY_LENGTH(output_pins));
+ set_input_pins(input_pins, std::size(input_pins));
+ set_output_pins(output_pins, std::size(output_pins));
}
@@ -6073,7 +6073,7 @@ static void config_gal20v8_pins(const pal_data* pal, const jed_data* jed)
static uint16_t input_pins_registered[] = {2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23};
static uint16_t input_pins_combinatorialcomplex[] = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 13, 14, 16, 17, 18, 19, 20, 21, 23};
uint16_t input_pins_combinatorialsimple[22];
- pin_output_config output_pins[ARRAY_LENGTH(macrocells)];
+ pin_output_config output_pins[std::size(macrocells)];
uint16_t index, input_pin_count, output_pin_count;
output_pin_count = 0;
@@ -6089,12 +6089,12 @@ static void config_gal20v8_pins(const pal_data* pal, const jed_data* jed)
{
/* Complex Mode */
- set_input_pins(input_pins_combinatorialcomplex, ARRAY_LENGTH(input_pins_combinatorialcomplex));
+ set_input_pins(input_pins_combinatorialcomplex, std::size(input_pins_combinatorialcomplex));
memcpy(gal20v8pinfuserows, pinfuserows_combinatorialcomplex, sizeof(pinfuserows_combinatorialcomplex));
memcpy(gal20v8pinfusecolumns, pinfusecolumns_combinatorialcomplex, sizeof(pinfusecolumns_combinatorialcomplex));
- for (index = 0; index < ARRAY_LENGTH(macrocells); ++index)
+ for (index = 0; index < std::size(macrocells); ++index)
{
if (is_gal20v8_product_term_enabled(pal, jed, pal->pinfuserows[index].fuserowoutputenable) &&
does_output_enable_fuse_row_allow_output(pal, jed, pal->pinfuserows[index].fuserowoutputenable))
@@ -6148,7 +6148,7 @@ static void config_gal20v8_pins(const pal_data* pal, const jed_data* jed)
memcpy(gal20v8pinfuserows, pinfuserows_combinatorialsimple, sizeof(pinfuserows_combinatorialsimple));
memcpy(gal20v8pinfusecolumns, pinfusecolumns_combinatorialsimple, sizeof(pinfusecolumns_combinatorialsimple));
- for (index = 0; index < ARRAY_LENGTH(macrocells); ++index)
+ for (index = 0; index < std::size(macrocells); ++index)
{
if (jed_get_fuse(jed, macrocells[index].ac1_fuse))
{
@@ -6206,11 +6206,11 @@ static void config_gal20v8_pins(const pal_data* pal, const jed_data* jed)
{
/* Registered */
- set_input_pins(input_pins_registered, ARRAY_LENGTH(input_pins_registered));
+ set_input_pins(input_pins_registered, std::size(input_pins_registered));
memcpy(gal20v8pinfusecolumns, pinfusecolumns_registered, sizeof(pinfusecolumns_registered));
- for (index = 0; index < ARRAY_LENGTH(macrocells); ++index)
+ for (index = 0; index < std::size(macrocells); ++index)
{
if (jed_get_fuse(jed, macrocells[index].ac1_fuse))
{
@@ -6295,12 +6295,12 @@ static void config_palce22v10_pal22v10_pins(const pal_data* pal, const jed_data*
{22, 5810, 5811},
{23, 5808, 5809}};
static uint16_t input_pins[] = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23};
- pin_output_config output_pins[ARRAY_LENGTH(macrocells)];
+ pin_output_config output_pins[std::size(macrocells)];
uint16_t index, output_pin_count;
output_pin_count = 0;
- for (index = 0; index < ARRAY_LENGTH(output_pins); ++index)
+ for (index = 0; index < std::size(output_pins); ++index)
{
if (jed_get_fuse(jed, macrocells[index].s1_fuse))
{
@@ -6343,7 +6343,7 @@ static void config_palce22v10_pal22v10_pins(const pal_data* pal, const jed_data*
}
}
- set_input_pins(input_pins, ARRAY_LENGTH(input_pins));
+ set_input_pins(input_pins, std::size(input_pins));
set_output_pins(output_pins, output_pin_count);
}
@@ -6376,12 +6376,12 @@ static void config_gal22v10_pins(const pal_data* pal, const jed_data* jed)
{22, 5810, 5811},
{23, 5808, 5809}};
static uint16_t input_pins[] = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23};
- pin_output_config output_pins[ARRAY_LENGTH(macrocells)];
+ pin_output_config output_pins[std::size(macrocells)];
uint16_t index, output_pin_count;
output_pin_count = 0;
- for (index = 0; index < ARRAY_LENGTH(output_pins); ++index)
+ for (index = 0; index < std::size(output_pins); ++index)
{
if (jed_get_fuse(jed, macrocells[index].s1_fuse))
{
@@ -6424,7 +6424,7 @@ static void config_gal22v10_pins(const pal_data* pal, const jed_data* jed)
}
}
- set_input_pins(input_pins, ARRAY_LENGTH(input_pins));
+ set_input_pins(input_pins, std::size(input_pins));
set_output_pins(output_pins, output_pin_count);
}
@@ -6457,7 +6457,7 @@ static void config_atf22v10_power_down_mode_pins(const pal_data* pal, const jed_
{22, 5810, 5811},
{23, 5808, 5809}};
static uint16_t input_pins[] = {1, 2, 3, 5, 6, 7, 8, 9, 10, 11, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23};
- pin_output_config output_pins[ARRAY_LENGTH(macrocells)];
+ pin_output_config output_pins[std::size(macrocells)];
uint16_t index, output_pin_count;
output_pin_count = 0;
@@ -6467,7 +6467,7 @@ static void config_atf22v10_power_down_mode_pins(const pal_data* pal, const jed_
fprintf(stderr, "Warning: Power down fuse not blown!\n");
}
- for (index = 0; index < ARRAY_LENGTH(output_pins); ++index)
+ for (index = 0; index < std::size(output_pins); ++index)
{
if (jed_get_fuse(jed, macrocells[index].s1_fuse))
{
@@ -6510,7 +6510,7 @@ static void config_atf22v10_power_down_mode_pins(const pal_data* pal, const jed_
}
}
- set_input_pins(input_pins, ARRAY_LENGTH(input_pins));
+ set_input_pins(input_pins, std::size(input_pins));
set_output_pins(output_pins, output_pin_count);
}
@@ -6549,7 +6549,7 @@ static void config_82s153_pls153_pins(const pal_data* pal, const jed_data* jed)
}
}
- set_input_pins(input_pins, ARRAY_LENGTH(input_pins));
+ set_input_pins(input_pins, std::size(input_pins));
set_output_pins(output_pins, output_pin_count);
}
@@ -6588,7 +6588,7 @@ static void config_ck2605_pins(const pal_data* pal, const jed_data* jed)
}
}
- set_input_pins(input_pins, ARRAY_LENGTH(input_pins));
+ set_input_pins(input_pins, std::size(input_pins));
set_output_pins(output_pins, output_pin_count);
}
@@ -6622,7 +6622,7 @@ static void config_epl10p8_pins(const pal_data* pal, const jed_data* jed)
pin_output_config output_pins[8];
uint16_t index;
- for (index = 0; index < ARRAY_LENGTH(memory_cells); ++index)
+ for (index = 0; index < std::size(memory_cells); ++index)
{
output_pins[index].pin = memory_cells[index].pin;
output_pins[index].flags = OUTPUT_COMBINATORIAL | OUTPUT_FEEDBACK_NONE;
@@ -6637,8 +6637,8 @@ static void config_epl10p8_pins(const pal_data* pal, const jed_data* jed)
}
}
- set_input_pins(input_pins, ARRAY_LENGTH(input_pins));
- set_output_pins(output_pins, ARRAY_LENGTH(output_pins));
+ set_input_pins(input_pins, std::size(input_pins));
+ set_output_pins(output_pins, std::size(output_pins));
}
@@ -6670,7 +6670,7 @@ static void config_epl12p6_pins(const pal_data* pal, const jed_data* jed)
pin_output_config output_pins[8];
uint16_t index;
- for (index = 0; index < ARRAY_LENGTH(memory_cells); ++index)
+ for (index = 0; index < std::size(memory_cells); ++index)
{
output_pins[index].pin = memory_cells[index].pin;
output_pins[index].flags = OUTPUT_COMBINATORIAL | OUTPUT_FEEDBACK_NONE;
@@ -6685,8 +6685,8 @@ static void config_epl12p6_pins(const pal_data* pal, const jed_data* jed)
}
}
- set_input_pins(input_pins, ARRAY_LENGTH(input_pins));
- set_output_pins(output_pins, ARRAY_LENGTH(output_pins));
+ set_input_pins(input_pins, std::size(input_pins));
+ set_output_pins(output_pins, std::size(output_pins));
}
@@ -6716,7 +6716,7 @@ static void config_epl14p4_pins(const pal_data* pal, const jed_data* jed)
pin_output_config output_pins[8];
uint16_t index;
- for (index = 0; index < ARRAY_LENGTH(memory_cells); ++index)
+ for (index = 0; index < std::size(memory_cells); ++index)
{
output_pins[index].pin = memory_cells[index].pin;
output_pins[index].flags = OUTPUT_COMBINATORIAL | OUTPUT_FEEDBACK_NONE;
@@ -6731,8 +6731,8 @@ static void config_epl14p4_pins(const pal_data* pal, const jed_data* jed)
}
}
- set_input_pins(input_pins, ARRAY_LENGTH(input_pins));
- set_output_pins(output_pins, ARRAY_LENGTH(output_pins));
+ set_input_pins(input_pins, std::size(input_pins));
+ set_output_pins(output_pins, std::size(output_pins));
}
@@ -6760,7 +6760,7 @@ static void config_epl16p2_pins(const pal_data* pal, const jed_data* jed)
pin_output_config output_pins[8];
uint16_t index;
- for (index = 0; index < ARRAY_LENGTH(memory_cells); ++index)
+ for (index = 0; index < std::size(memory_cells); ++index)
{
output_pins[index].pin = memory_cells[index].pin;
output_pins[index].flags = OUTPUT_COMBINATORIAL | OUTPUT_FEEDBACK_NONE;
@@ -6775,8 +6775,8 @@ static void config_epl16p2_pins(const pal_data* pal, const jed_data* jed)
}
}
- set_input_pins(input_pins, ARRAY_LENGTH(input_pins));
- set_output_pins(output_pins, ARRAY_LENGTH(output_pins));
+ set_input_pins(input_pins, std::size(input_pins));
+ set_output_pins(output_pins, std::size(output_pins));
}
@@ -6810,7 +6810,7 @@ static void config_epl16p8_pins(const pal_data* pal, const jed_data* jed)
pin_output_config output_pins[8];
uint16_t index;
- for (index = 0; index < ARRAY_LENGTH(memory_cells); ++index)
+ for (index = 0; index < std::size(memory_cells); ++index)
{
output_pins[index].pin = memory_cells[index].pin;
output_pins[index].flags = OUTPUT_COMBINATORIAL | OUTPUT_FEEDBACK_NONE;
@@ -6825,8 +6825,8 @@ static void config_epl16p8_pins(const pal_data* pal, const jed_data* jed)
}
}
- set_input_pins(input_pins, ARRAY_LENGTH(input_pins));
- set_output_pins(output_pins, ARRAY_LENGTH(output_pins));
+ set_input_pins(input_pins, std::size(input_pins));
+ set_output_pins(output_pins, std::size(output_pins));
}
@@ -6860,7 +6860,7 @@ static void config_epl16rp8_pins(const pal_data* pal, const jed_data* jed)
pin_output_config output_pins[8];
uint16_t index;
- for (index = 0; index < ARRAY_LENGTH(memory_cells); ++index)
+ for (index = 0; index < std::size(memory_cells); ++index)
{
output_pins[index].pin = memory_cells[index].pin;
output_pins[index].flags = OUTPUT_REGISTERED | OUTPUT_FEEDBACK_REGISTERED;
@@ -6875,8 +6875,8 @@ static void config_epl16rp8_pins(const pal_data* pal, const jed_data* jed)
}
}
- set_input_pins(input_pins, ARRAY_LENGTH(input_pins));
- set_output_pins(output_pins, ARRAY_LENGTH(output_pins));
+ set_input_pins(input_pins, std::size(input_pins));
+ set_output_pins(output_pins, std::size(output_pins));
}
@@ -6910,7 +6910,7 @@ static void config_epl16rp6_pins(const pal_data* pal, const jed_data* jed)
pin_output_config output_pins[8];
uint16_t index;
- for (index = 0; index < ARRAY_LENGTH(memory_cells); ++index)
+ for (index = 0; index < std::size(memory_cells); ++index)
{
output_pins[index].pin = memory_cells[index].pin;
@@ -6935,8 +6935,8 @@ static void config_epl16rp6_pins(const pal_data* pal, const jed_data* jed)
}
}
- set_input_pins(input_pins, ARRAY_LENGTH(input_pins));
- set_output_pins(output_pins, ARRAY_LENGTH(output_pins));
+ set_input_pins(input_pins, std::size(input_pins));
+ set_output_pins(output_pins, std::size(output_pins));
}
@@ -6970,7 +6970,7 @@ static void config_epl16rp4_pins(const pal_data* pal, const jed_data* jed)
pin_output_config output_pins[8];
uint16_t index;
- for (index = 0; index < ARRAY_LENGTH(memory_cells); ++index)
+ for (index = 0; index < std::size(memory_cells); ++index)
{
output_pins[index].pin = memory_cells[index].pin;
@@ -6994,8 +6994,8 @@ static void config_epl16rp4_pins(const pal_data* pal, const jed_data* jed)
}
}
- set_input_pins(input_pins, ARRAY_LENGTH(input_pins));
- set_output_pins(output_pins, ARRAY_LENGTH(output_pins));
+ set_input_pins(input_pins, std::size(input_pins));
+ set_output_pins(output_pins, std::size(output_pins));
}
#endif
@@ -7012,7 +7012,7 @@ static void config_pal10p8_pins(const pal_data* pal, const jed_data* jed)
pin_output_config output_pins[8];
uint16_t index;
- for (index = 0; index < ARRAY_LENGTH(output_pins); ++index)
+ for (index = 0; index < std::size(output_pins); ++index)
{
output_pins[index].pin = index + 12;
output_pins[index].flags = OUTPUT_COMBINATORIAL | OUTPUT_FEEDBACK_NONE;
@@ -7027,8 +7027,8 @@ static void config_pal10p8_pins(const pal_data* pal, const jed_data* jed)
}
}
- set_input_pins(input_pins, ARRAY_LENGTH(input_pins));
- set_output_pins(output_pins, ARRAY_LENGTH(output_pins));
+ set_input_pins(input_pins, std::size(input_pins));
+ set_output_pins(output_pins, std::size(output_pins));
}
@@ -7044,7 +7044,7 @@ static void config_pal12p6_pins(const pal_data* pal, const jed_data* jed)
pin_output_config output_pins[6];
uint16_t index;
- for (index = 0; index < ARRAY_LENGTH(output_pins); ++index)
+ for (index = 0; index < std::size(output_pins); ++index)
{
output_pins[index].pin = index + 13;
output_pins[index].flags = OUTPUT_COMBINATORIAL | OUTPUT_FEEDBACK_NONE;
@@ -7059,8 +7059,8 @@ static void config_pal12p6_pins(const pal_data* pal, const jed_data* jed)
}
}
- set_input_pins(input_pins, ARRAY_LENGTH(input_pins));
- set_output_pins(output_pins, ARRAY_LENGTH(output_pins));
+ set_input_pins(input_pins, std::size(input_pins));
+ set_output_pins(output_pins, std::size(output_pins));
}
@@ -7076,7 +7076,7 @@ static void config_pal14p4_pins(const pal_data* pal, const jed_data* jed)
pin_output_config output_pins[4];
uint16_t index;
- for (index = 0; index < ARRAY_LENGTH(output_pins); ++index)
+ for (index = 0; index < std::size(output_pins); ++index)
{
output_pins[index].pin = index + 14;
output_pins[index].flags = OUTPUT_COMBINATORIAL | OUTPUT_FEEDBACK_NONE;
@@ -7091,8 +7091,8 @@ static void config_pal14p4_pins(const pal_data* pal, const jed_data* jed)
}
}
- set_input_pins(input_pins, ARRAY_LENGTH(input_pins));
- set_output_pins(output_pins, ARRAY_LENGTH(output_pins));
+ set_input_pins(input_pins, std::size(input_pins));
+ set_output_pins(output_pins, std::size(output_pins));
}
@@ -7108,7 +7108,7 @@ static void config_pal16p2_pins(const pal_data* pal, const jed_data* jed)
pin_output_config output_pins[2];
uint16_t index;
- for (index = 0; index < ARRAY_LENGTH(output_pins); ++index)
+ for (index = 0; index < std::size(output_pins); ++index)
{
output_pins[index].pin = index + 15;
output_pins[index].flags = OUTPUT_COMBINATORIAL | OUTPUT_FEEDBACK_NONE;
@@ -7123,8 +7123,8 @@ static void config_pal16p2_pins(const pal_data* pal, const jed_data* jed)
}
}
- set_input_pins(input_pins, ARRAY_LENGTH(input_pins));
- set_output_pins(output_pins, ARRAY_LENGTH(output_pins));
+ set_input_pins(input_pins, std::size(input_pins));
+ set_output_pins(output_pins, std::size(output_pins));
}
@@ -7162,7 +7162,7 @@ static void config_pal16p8_pins(const pal_data* pal, const jed_data* jed)
}
}
- set_input_pins(input_pins, ARRAY_LENGTH(input_pins));
+ set_input_pins(input_pins, std::size(input_pins));
set_output_pins(output_pins, output_pin_count);
}
@@ -7216,7 +7216,7 @@ static void config_pal16rp4_pins(const pal_data* pal, const jed_data* jed)
++output_pin_count;
}
- for (index = 0; index < ARRAY_LENGTH(registered_pins); ++index)
+ for (index = 0; index < std::size(registered_pins); ++index)
{
output_pins[output_pin_count].pin = registered_pins[index];
output_pins[output_pin_count].flags = OUTPUT_REGISTERED | OUTPUT_FEEDBACK_REGISTERED;
@@ -7267,7 +7267,7 @@ static void config_pal16rp4_pins(const pal_data* pal, const jed_data* jed)
++output_pin_count;
}
- set_input_pins(input_pins, ARRAY_LENGTH(input_pins));
+ set_input_pins(input_pins, std::size(input_pins));
set_output_pins(output_pins, output_pin_count);
}
@@ -7304,7 +7304,7 @@ static void config_pal16rp6_pins(const pal_data* pal, const jed_data* jed)
++output_pin_count;
}
- for (index = 0; index < ARRAY_LENGTH(registered_pins); ++index)
+ for (index = 0; index < std::size(registered_pins); ++index)
{
output_pins[output_pin_count].pin = registered_pins[index];
output_pins[output_pin_count].flags = OUTPUT_REGISTERED | OUTPUT_FEEDBACK_REGISTERED;
@@ -7338,7 +7338,7 @@ static void config_pal16rp6_pins(const pal_data* pal, const jed_data* jed)
++output_pin_count;
}
- set_input_pins(input_pins, ARRAY_LENGTH(input_pins));
+ set_input_pins(input_pins, std::size(input_pins));
set_output_pins(output_pins, output_pin_count);
}
@@ -7363,7 +7363,7 @@ static void config_pal16rp8_pins(const pal_data* pal, const jed_data* jed)
{19, OUTPUT_REGISTERED | OUTPUT_FEEDBACK_REGISTERED}};
uint16_t index;
- for (index = 0; index < ARRAY_LENGTH(output_pins); ++index)
+ for (index = 0; index < std::size(output_pins); ++index)
{
if (!jed_get_fuse(jed, 2055 - index))
{
@@ -7375,8 +7375,8 @@ static void config_pal16rp8_pins(const pal_data* pal, const jed_data* jed)
}
}
- set_input_pins(input_pins, ARRAY_LENGTH(input_pins));
- set_output_pins(output_pins, ARRAY_LENGTH(output_pins));
+ set_input_pins(input_pins, std::size(input_pins));
+ set_output_pins(output_pins, std::size(output_pins));
}
@@ -7407,8 +7407,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_LENGTH(input_pins));
- set_output_pins(output_pins, ARRAY_LENGTH(output_pins));
+ set_input_pins(input_pins, std::size(input_pins));
+ set_output_pins(output_pins, std::size(output_pins));
}
@@ -7437,8 +7437,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_LENGTH(input_pins));
- set_output_pins(output_pins, ARRAY_LENGTH(output_pins));
+ set_input_pins(input_pins, std::size(input_pins));
+ set_output_pins(output_pins, std::size(output_pins));
}
@@ -7463,8 +7463,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_LENGTH(input_pins));
- set_output_pins(output_pins, ARRAY_LENGTH(output_pins));
+ set_input_pins(input_pins, std::size(input_pins));
+ set_output_pins(output_pins, std::size(output_pins));
}
@@ -7489,8 +7489,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_LENGTH(input_pins));
- set_output_pins(output_pins, ARRAY_LENGTH(output_pins));
+ set_input_pins(input_pins, std::size(input_pins));
+ set_output_pins(output_pins, std::size(output_pins));
}
@@ -7513,8 +7513,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_LENGTH(input_pins));
- set_output_pins(output_pins, ARRAY_LENGTH(output_pins));
+ set_input_pins(input_pins, std::size(input_pins));
+ set_output_pins(output_pins, std::size(output_pins));
}
@@ -7537,8 +7537,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_LENGTH(input_pins));
- set_output_pins(output_pins, ARRAY_LENGTH(output_pins));
+ set_input_pins(input_pins, std::size(input_pins));
+ set_output_pins(output_pins, std::size(output_pins));
}
@@ -7559,8 +7559,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_LENGTH(input_pins));
- set_output_pins(output_pins, ARRAY_LENGTH(output_pins));
+ set_input_pins(input_pins, std::size(input_pins));
+ set_output_pins(output_pins, std::size(output_pins));
}
@@ -7581,8 +7581,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_LENGTH(input_pins));
- set_output_pins(output_pins, ARRAY_LENGTH(output_pins));
+ set_input_pins(input_pins, std::size(input_pins));
+ set_output_pins(output_pins, std::size(output_pins));
}
@@ -7601,8 +7601,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_LENGTH(input_pins));
- set_output_pins(output_pins, ARRAY_LENGTH(output_pins));
+ set_input_pins(input_pins, std::size(input_pins));
+ set_output_pins(output_pins, std::size(output_pins));
}
@@ -7621,8 +7621,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_LENGTH(input_pins));
- set_output_pins(output_pins, ARRAY_LENGTH(output_pins));
+ set_input_pins(input_pins, std::size(input_pins));
+ set_output_pins(output_pins, std::size(output_pins));
}
@@ -7639,8 +7639,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_LENGTH(input_pins));
- set_output_pins(output_pins, ARRAY_LENGTH(output_pins));
+ set_input_pins(input_pins, std::size(input_pins));
+ set_output_pins(output_pins, std::size(output_pins));
}
@@ -7657,8 +7657,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_LENGTH(input_pins));
- set_output_pins(output_pins, ARRAY_LENGTH(output_pins));
+ set_input_pins(input_pins, std::size(input_pins));
+ set_output_pins(output_pins, std::size(output_pins));
}
@@ -7673,7 +7673,7 @@ static void config_82s100_pls100_pins(const pal_data* pal, const jed_data* jed)
static uint16_t input_pins[] = {9, 8, 7, 6, 5, 4, 3, 2, 27, 26, 25, 24, 23, 22, 21, 20};
pin_output_config output_pins[8];
- for (uint16_t index = 0; index < ARRAY_LENGTH(output_pins); ++index)
+ for (uint16_t index = 0; index < std::size(output_pins); ++index)
{
output_pins[index].pin = pal->pinfuserows[index].pin;
output_pins[index].flags = OUTPUT_COMBINATORIAL | OUTPUT_FEEDBACK_NONE;
@@ -7688,8 +7688,8 @@ static void config_82s100_pls100_pins(const pal_data* pal, const jed_data* jed)
}
}
- set_input_pins(input_pins, ARRAY_LENGTH(input_pins));
- set_output_pins(output_pins, ARRAY_LENGTH(output_pins));
+ set_input_pins(input_pins, std::size(input_pins));
+ set_output_pins(output_pins, std::size(output_pins));
}
@@ -8195,7 +8195,7 @@ static int command_viewlist(int argc, char *argv[])
return print_usage();
}
- for (index = 0; index < ARRAY_LENGTH(paldata); ++index)
+ for (index = 0; index < std::size(paldata); ++index)
{
nameset.insert(paldata[index].name);
}
@@ -8265,7 +8265,7 @@ static int command_listcompatible(int argc, char *argv[])
}
}
- for (index = 0; index < ARRAY_LENGTH(paldata); ++index)
+ for (index = 0; index < std::size(paldata); ++index)
{
if (paldata[index].numfuses == jed.numfuses)
{
@@ -8298,7 +8298,7 @@ int main(int argc, char *argv[])
return print_usage();
}
- for (index = 0; index < ARRAY_LENGTH(command_entries); ++index)
+ for (index = 0; index < std::size(command_entries); ++index)
{
if (!strcmp(argv[1], command_entries[index].command))
return command_entries[index].command_func(argc - 2, &argv[2]);