folkert/simh-testsetgenerator
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

AltairZ80: Replaced platform specific directory scanning with SCP API (update 2)

Browse source
This commit is contained in:
Peter Schorn 2018-05-19 15:53:42 +02:00
parent 4734454bac
commit b3136d2d6d
1 changed files with 84 additions and 110 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

190
AltairZ80/altairz80_sio.c
View file

@ -56,11 +56,6 @@
#include "sim_tmxr.h" #include "sim_tmxr.h"
#include <time.h> #include <time.h>
#include <assert.h> #include <assert.h>
#if UNIX_PLATFORM
#include <glob.h>
#elif defined (_WIN32)
#include <windows.h>
#endif
uint8 *URLContents(const char *URL, uint32 *length); uint8 *URLContents(const char *URL, uint32 *length);
#ifndef URL_READER_SUPPORT #ifndef URL_READER_SUPPORT
@ -124,6 +119,7 @@ uint8 *URLContents(const char *URL, uint32 *length) {
#define PORT_TABLE_SIZE 256 /* size of port mapping table */ #define PORT_TABLE_SIZE 256 /* size of port mapping table */
#define SLEEP_ALLOWED_START_DEFAULT 100 /* default initial value for sleepAllowedCounter*/ #define SLEEP_ALLOWED_START_DEFAULT 100 /* default initial value for sleepAllowedCounter*/
#define DEFAULT_TIMER_DELTA 100 /* default value for timer delta in ms */ #define DEFAULT_TIMER_DELTA 100 /* default value for timer delta in ms */
#define CPM_COMMAND_LINE_LENGTH 128
static t_stat simh_dev_set_timeron (UNIT *uptr, int32 value, CONST char *cptr, void *desc); static t_stat simh_dev_set_timeron (UNIT *uptr, int32 value, CONST char *cptr, void *desc);
static t_stat simh_dev_set_timeroff (UNIT *uptr, int32 value, CONST char *cptr, void *desc); static t_stat simh_dev_set_timeroff (UNIT *uptr, int32 value, CONST char *cptr, void *desc);
@ -231,23 +227,56 @@ static uint32 newClockFrequency;
static int32 setClockFrequencyPos = 0; /* determines state for sending the clock frequency */ static int32 setClockFrequencyPos = 0; /* determines state for sending the clock frequency */
static int32 getClockFrequencyPos = 0; /* determines state for receiving the clock frequency */ static int32 getClockFrequencyPos = 0; /* determines state for receiving the clock frequency */
/* support for wild card expansion */ /* support for wild card file expansion */
#if UNIX_PLATFORM
static glob_t globS; #if defined (__MWERKS__) && defined (macintosh)
static uint32 globPosNameList = 0; const static char hostPathSeparator = ':'; /* colon on Macintosh OS 9 */
static int32 globPosName = 0; const static char hostPathSeparatorAlt = ':'; /* no alternative */
static int32 globValid = FALSE;
static int32 globError = 0;
#elif defined (_WIN32) #elif defined (_WIN32)
static WIN32_FIND_DATA FindFileData; const static char hostPathSeparator = '\\'; /* back slash in Windows */
static HANDLE hFind = INVALID_HANDLE_VALUE; const static char hostPathSeparatorAlt = '/'; /* '/' is an alternative */
static int32 globFinished = FALSE; #else
static int32 globValid = FALSE; const static char hostPathSeparator = '/'; /* slash in UNIX */
static int32 globPosName = 0; const static char hostPathSeparatorAlt = '/'; /* no alternative */
static int32 lastPathSeparator = 0;
static int32 firstPathCharacter = 0;
#endif #endif
typedef struct NameNode {
char *name;
struct NameNode *next;
} NameNode_t;
static char cpmCommandLine[CPM_COMMAND_LINE_LENGTH];
static NameNode_t *nameListHead = NULL;
static NameNode_t *currentName = NULL;
static int32 currentNameIndex = 0;
static int32 lastPathSeparatorIndex = 0;
static int32 firstPathCharacterIndex = 0;
static void deleteNameList() {
while (nameListHead != NULL) {
NameNode_t *next = nameListHead -> next;
free(nameListHead -> name);
free(nameListHead);
nameListHead = next;
}
currentName = NULL;
currentNameIndex = 0;
}
static void processDirEntry (const char *directory,
const char *filename,
t_offset FileSize,
const struct stat *filestat,
void *context) {
if (filename != NULL) {
NameNode_t *top = (NameNode_t *)malloc(sizeof(NameNode_t));
top -> name = strdup(filename);
top -> next = nameListHead;
nameListHead = top;
}
}
/* SIO status registers */ /* SIO status registers */
static int32 warnLevelSIO = 3; /* display at most 'warnLevelSIO' times the same warning */ static int32 warnLevelSIO = 3; /* display at most 'warnLevelSIO' times the same warning */
static int32 warnUnattachedPTP = 0; /* display a warning message if < warnLevel and SIO set to static int32 warnUnattachedPTP = 0; /* display a warning message if < warnLevel and SIO set to
@ -1224,7 +1253,6 @@ static const char *cmdNames[kSimhPseudoDeviceCommands] = {
"setCPUClockFrequency", "setCPUClockFrequency",
}; };
#define CPM_COMMAND_LINE_LENGTH 128
#define TIMER_STACK_LIMIT 10 /* stack depth of timer stack */ #define TIMER_STACK_LIMIT 10 /* stack depth of timer stack */
static uint32 markTime[TIMER_STACK_LIMIT]; /* timer stack */ static uint32 markTime[TIMER_STACK_LIMIT]; /* timer stack */
static struct tm currentTime; static struct tm currentTime;
@ -1309,7 +1337,6 @@ static t_stat simh_svc(UNIT *uptr) {
return SCPE_OK; return SCPE_OK;
} }
static char cpmCommandLine[CPM_COMMAND_LINE_LENGTH];
static void createCPMCommandLine(void) { static void createCPMCommandLine(void) {
int32 i, len = (GetBYTEWrapper(0x80) & 0x7f); /* 0x80 contains length of command line, discard first char */ int32 i, len = (GetBYTEWrapper(0x80) & 0x7f); /* 0x80 contains length of command line, discard first char */
for (i = 0; i < len - 1; i++) for (i = 0; i < len - 1; i++)
@ -1317,18 +1344,6 @@ static void createCPMCommandLine(void) {
cpmCommandLine[i] = 0; /* make C string */ cpmCommandLine[i] = 0; /* make C string */
} }
#if defined (_WIN32)
static void setLastPathSeparator(void) {
int32 i = 0;
while (cpmCommandLine[i])
i++;
while ((i >= 0) && (cpmCommandLine[i] != '\\'))
i--;
lastPathSeparator = i;
firstPathCharacter = 0;
}
#endif
/* The CP/M command line is used as the name of a file and UNIT* uptr is attached to it. */ /* The CP/M command line is used as the name of a file and UNIT* uptr is attached to it. */
static void attachCPM(UNIT *uptr) { static void attachCPM(UNIT *uptr) {
createCPMCommandLine(); createCPMCommandLine();
@ -1419,37 +1434,23 @@ static int32 simh_in(const int32 port) {
break; break;
case getHostFilenamesCmd: case getHostFilenamesCmd:
#if UNIX_PLATFORM if (nameListHead != NULL) {
if (globValid) { if (currentName == NULL) {
if (globPosNameList < globS.gl_pathc) { deleteNameList();
if (!(result = globS.gl_pathv[globPosNameList][globPosName++])) { lastCommand = 0;
globPosNameList++;
globPosName = 0;
}
} }
else if (firstPathCharacterIndex <= lastPathSeparatorIndex)
result = cpmCommandLine[firstPathCharacterIndex++];
else { else {
globValid = FALSE; result = currentName -> name[currentNameIndex];
lastCommand = 0; if (result == 0) {
globfree(&globS); currentName = currentName -> next;
firstPathCharacterIndex = currentNameIndex = 0;
}
else
currentNameIndex++;
} }
} }
#elif defined (_WIN32)
if (globValid)
if (globFinished)
globValid = FALSE;
else if (firstPathCharacter <= lastPathSeparator)
result = cpmCommandLine[firstPathCharacter++];
else if (!(result = FindFileData.cFileName[globPosName++])) {
globPosName = firstPathCharacter = 0;
if (!FindNextFile(hFind, &FindFileData)) {
globFinished = TRUE;
FindClose(hFind);
hFind = INVALID_HANDLE_VALUE;
}
}
#else
lastCommand = 0;
#endif
break; break;
case attachPTRCmd: case attachPTRCmd:
@ -1586,13 +1587,7 @@ static int32 simh_in(const int32 port) {
break; break;
case getHostOSPathSeparatorCmd: case getHostOSPathSeparatorCmd:
#if defined (__MWERKS__) && defined (macintosh) result = hostPathSeparator;
result = ':'; /* colon on Macintosh OS 9 */
#elif defined (_WIN32)
result = '\\'; /* back slash in Windows */
#else
result = '/'; /* slash in UNIX */
#endif
break; break;
default: default:
@ -1728,39 +1723,30 @@ static int32 simh_out(const int32 port, const int32 data) {
isInReadPhase = FALSE; isInReadPhase = FALSE;
break; break;
case getHostFilenamesCmd: case getHostFilenamesCmd: /* list files of host file directory */
#if UNIX_PLATFORM if (nameListHead == NULL) {
if (!globValid) { t_stat result;
globValid = TRUE;
globPosNameList = globPosName = 0;
createCPMCommandLine(); createCPMCommandLine();
globError = glob(cpmCommandLine, GLOB_ERR, NULL, &globS); lastPathSeparatorIndex = 0;
if (globError) { while (cpmCommandLine[lastPathSeparatorIndex])
lastPathSeparatorIndex++;
while ((lastPathSeparatorIndex >= 0) && (cpmCommandLine[lastPathSeparatorIndex] != hostPathSeparator) && (cpmCommandLine[lastPathSeparatorIndex] != hostPathSeparatorAlt))
lastPathSeparatorIndex--;
firstPathCharacterIndex = 0;
deleteNameList();
result = sim_dir_scan(cpmCommandLine, processDirEntry, NULL);
if (result == SCPE_OK) {
currentName = nameListHead;
currentNameIndex = 0;
} else {
deleteNameList();
sim_debug(VERBOSE_MSG, &simh_device, sim_debug(VERBOSE_MSG, &simh_device,
"SIMH: " ADDRESS_FORMAT "SIMH: " ADDRESS_FORMAT
" Cannot expand '%s'. Error is %i.\n", " Cannot expand '%s'. Error is %s.\n",
PCX, cpmCommandLine, globError); PCX, cpmCommandLine, sim_error_text(result));
globfree(&globS);
globValid = FALSE;
} }
} }
#elif defined (_WIN32)
if (!globValid) {
globValid = TRUE;
globPosName = 0;
globFinished = FALSE;
createCPMCommandLine();
setLastPathSeparator();
hFind = FindFirstFile(cpmCommandLine, &FindFileData);
if (hFind == INVALID_HANDLE_VALUE) {
sim_debug(VERBOSE_MSG, &simh_device,
"SIMH: " ADDRESS_FORMAT
" Cannot expand '%s'. Error is %lu.\n",
PCX, cpmCommandLine, GetLastError());
globValid = FALSE;
}
}
#endif
break; break;
case SIMHSleepCmd: case SIMHSleepCmd:
@ -1858,19 +1844,7 @@ static int32 simh_out(const int32 port, const int32 data) {
case resetSIMHInterfaceCmd: case resetSIMHInterfaceCmd:
markTimeSP = 0; markTimeSP = 0;
lastCommand = 0; lastCommand = 0;
#if UNIX_PLATFORM deleteNameList();
if (globValid) {
globValid = FALSE;
globfree(&globS);
}
#elif defined (_WIN32)
if (globValid) {
globValid = FALSE;
if (hFind != INVALID_HANDLE_VALUE) {
FindClose(hFind);
}
}
#endif
break; break;
case showTimerCmd: /* show time difference to timer on top of stack */ case showTimerCmd: /* show time difference to timer on top of stack */