Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-04-25 09:50:04 +03:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

pla.cpp, jedparse, jedutil: Added recognition and some support for alternative PLA binary format DataIO

Browse Source
This commit is contained in:
Joakim Larsson Edstrom 2019-12-18 12:45:01 +01:00
parent e1c7a3b69b
commit 88b532d28a
4 changed files with 53 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/devices/machine/pla.cpp
View File

@ -12,9 +12,11 @@
#include "plaparse.h" #include "plaparse.h"
#define LOG_TERMS (1 << 0U) #define LOG_TERMS (1 << 0U)
//#define VERBOSE (LOG_TERMS)
#include "logmacro.h"
//#define VERBOSE (LOG_TERMS)
//#define LOG_OUTPUT_STREAM std::cout
#include "logmacro.h"
DEFINE_DEVICE_TYPE(PLA, pla_device, "pla", "PLA") DEFINE_DEVICE_TYPE(PLA, pla_device, "pla", "PLA")
DEFINE_DEVICE_TYPE(PLS100, pls100_device, "pls100", "82S100-series PLA") DEFINE_DEVICE_TYPE(PLS100, pls100_device, "pls100", "82S100-series PLA")
@ -123,6 +125,8 @@ void pla_device::parse_fusemap()
return; return;
} }
LOGMASKED(LOG_TERMS, "PLA read and parsed, %d fuses in %s format\n", jed.numfuses, jed.binfmt == MAXLOADER ? "Maxloader" : "DataIO" );
// parse it // parse it
uint32_t fusenum = 0; uint32_t fusenum = 0;
@ -135,11 +139,21 @@ void pla_device::parse_fusemap()
for (int i = 0; i < m_inputs; i++) for (int i = 0; i < m_inputs; i++)
{ {
// complement if (jed.binfmt == MAXLOADER)
term->and_mask |= (uint64_t)jed_get_fuse(&jed, fusenum++) << (i + 32); {
term->and_mask |= (uint64_t)jed_get_fuse(&jed, fusenum++) << (i + 32); // complement
// true term->and_mask |= (uint64_t)jed_get_fuse(&jed, fusenum++) << i; // true
term->and_mask |= (uint64_t)jed_get_fuse(&jed, fusenum++) << i; }
else if (jed.binfmt == DATAIO)
{
term->and_mask |= (uint64_t)jed_get_fuse(&jed, fusenum++) << i; // true
term->and_mask |= (uint64_t)jed_get_fuse(&jed, fusenum++) << (i + 32); // complement
}
else
{
logerror("PLA parser: Unknown JED format\n");
break;
}
} }
// OR mask // OR mask

15
src/lib/util/jedparse.cpp
View File

@ -391,9 +391,24 @@ int jedbin_parse(const void *data, size_t length, jed_data *result)
/* first unpack the number of fuses */ /* first unpack the number of fuses */
result->numfuses = (cursrc[0] << 24) | (cursrc[1] << 16) | (cursrc[2] << 8) | cursrc[3]; result->numfuses = (cursrc[0] << 24) | (cursrc[1] << 16) | (cursrc[2] << 8) | cursrc[3];
cursrc += 4; cursrc += 4;
if (result->numfuses == 0 || result->numfuses > JED_MAX_FUSES) if (result->numfuses == 0 || result->numfuses > JED_MAX_FUSES)
return JEDERR_INVALID_DATA; return JEDERR_INVALID_DATA;
/* Detect DataIO binary format and prepare for conversion. This transformation is based on observation of an 82S100 dump */
if (result->numfuses == ((cursrc[0] << 24) | (cursrc[1] << 16) | (cursrc[2] << 8) | cursrc[3]))
{
result->numfuses = (result->numfuses - 9) * 8; // Double 32 bit byte file size header + trailing byte to Single 32 byte fuse count
cursrc = cursrc + 4; // Adjust start of buffer, trailing byte will not be copied below
result->binfmt = DATAIO; // DataIO also has swapped inverted/non-inverted line fuses so remember origin
if (LOG_PARSE) printf("DATAIO format detected\n");
}
else
{
result->binfmt = MAXLOADER; // This is the old format just set for completeness.
if (LOG_PARSE) printf("MAXLOADER format detected\n");
}
/* now make sure we have enough data in the source */ /* now make sure we have enough data in the source */
if (length < 4 + (result->numfuses + 7) / 8) if (length < 4 + (result->numfuses + 7) / 8)
return JEDERR_INVALID_DATA; return JEDERR_INVALID_DATA;

6
src/lib/util/jedparse.h
View File

@ -29,7 +29,10 @@
#define JEDERR_BAD_XMIT_SUM 2 #define JEDERR_BAD_XMIT_SUM 2
#define JEDERR_BAD_FUSE_SUM 3 #define JEDERR_BAD_FUSE_SUM 3
enum fileformats {
MAXLOADER,
DATAIO
};
/*************************************************************************** /***************************************************************************
TYPE DEFINITIONS TYPE DEFINITIONS
@ -39,6 +42,7 @@ struct jed_data
{ {
uint32_t numfuses; /* number of defined fuses */ uint32_t numfuses; /* number of defined fuses */
uint8_t fusemap[JED_MAX_FUSES / 8];/* array of bit-packed data */ uint8_t fusemap[JED_MAX_FUSES / 8];/* array of bit-packed data */
fileformats binfmt; /* file format MAXLOADER or DATAIO */
}; };

14
src/tools/jedutil.cpp
View File

@ -7429,9 +7429,19 @@ static int command_convert(int argc, char *argv[])
/* read the binary data */ /* read the binary data */
err = jedbin_parse(srcbuf, srcbuflen, &jed); err = jedbin_parse(srcbuf, srcbuflen, &jed);
switch (err)
if (err == JEDERR_INVALID_DATA)
{ {
case JEDERR_INVALID_DATA: fprintf(stderr, "Fatal error: Invalid binary JEDEC file\n"); free(srcbuf); return 1; fprintf(stderr, "Fatal error: Invalid binary JEDEC file\n");
free(srcbuf);
return 1;
}
if (jed.binfmt == DATAIO) // DATAIO is detected and not supported yet, it has swapped inverted/non-inverted line fuses
{
fprintf(stderr, "Fatal error: Unsupported DATAIO PLA format detected\n");
free(srcbuf);
return 1;
} }
/* print out data */ /* print out data */