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

MicroVAX2: Fix watch chip implementation

Browse source 
- In VMS mode, the day and month have to behave correctly to map the
  current day of year to the equivalent day of year in 1982
- The month maintained and returned by the watch chip has January as 1
  while the tm_mon field in the 'struct tm' has 0 for January.
This commit is contained in:
Mark Pizzolato 2016-04-13 12:12:29 -07:00
parent 14d1c4e2da
commit b4b4a88a4e
1 changed files with 18 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
VAX/vax_watch.c
View file

@ -162,6 +162,7 @@ int32 wtc_rd (int32 pa)
int32 rg = (pa >> 1) & 0xF; int32 rg = (pa >> 1) & 0xF;
int32 val = 0; int32 val = 0;
time_t curr; time_t curr;
static int mdays[12] = {31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31};
struct tm *ctm = NULL; struct tm *ctm = NULL;
if (rg < 10) { /* time reg? */ if (rg < 10) { /* time reg? */
@ -171,6 +172,22 @@ if (rg < 10) { /* time reg? */
ctm = localtime (&curr); /* decompose */ ctm = localtime (&curr); /* decompose */
if (ctm == NULL) /* error? */ if (ctm == NULL) /* error? */
return 0; return 0;
if ((wtc_mode == WTC_MODE_VMS) &&
((ctm->tm_year % 4) == 0)) { /* Leap Year? */
if (ctm->tm_mon > 1) { /* Past February? */
++ctm->tm_mday; /* Adjust for Leap Day */
if (ctm->tm_mday > mdays[ctm->tm_mon]) { /* wrap to last day of prior month */
++ctm->tm_mon;
ctm->tm_mday = 1;
}
}
else
if ((ctm->tm_mon == 1) && /* February 29th? */
(ctm->tm_mday == 29)) {
ctm->tm_mon = 2; /* Is March 1 in 1982 */
ctm->tm_mday = 1;
}
}
} }
switch(rg) { switch(rg) {
@ -196,7 +213,7 @@ switch(rg) {
break; break;
case 8: /* month */ case 8: /* month */
val = ctm->tm_mon; val = ctm->tm_mon + 1;
break; break;
case 9: /* year */ case 9: /* year */