diff --git a/common/file.c b/common/file.c index 90d2c23..aa3b0ce 100644 --- a/common/file.c +++ b/common/file.c @@ -44,7 +44,10 @@ __RCSID("$NetBSD: file.c,v 1.16 2016/06/08 01:11:49 christos Exp $"); # include "../netbsd_h/exec_aout.h" # endif # if !defined(MID_VAX) -# define MID_VAX 140 +# define MID_VAX 150 +# endif +# if !defined(MID_VAX1K) +# define MID_VAX1K 140 # endif #endif /* NOAOUT */ @@ -326,6 +329,11 @@ getMID(int old_mid, int new_mid) mid = MID_VAX; break; #endif +#ifdef MID_VAX1K + case MID_VAX1K: + mid = MID_VAX1K; + break; +#endif #ifdef MID_ALPHA case MID_ALPHA: mid = MID_ALPHA; @@ -354,8 +362,8 @@ getCLBYTES(int mid) int clbytes; switch (mid) { -#ifdef MID_VAX - case MID_VAX: +#ifdef MID_VAX1K + case MID_VAX1K: clbytes = 1024; break; #endif @@ -377,8 +385,12 @@ getCLBYTES(int mid) #ifdef MID_ARM6 case MID_ARM6: #endif +#ifdef MID_VAX + case MID_VAX: +#endif #if defined(MID_I386) || defined(MID_M68K4K) || defined(MID_NS32532) || \ - defined(MID_PMAX) || defined(MID_MIPS) || defined(MID_ARM6) + defined(MID_PMAX) || defined(MID_MIPS) || defined(MID_ARM6) || \ + defined(MID_VAX) clbytes = 4096; break; #endif @@ -695,6 +707,9 @@ GetAOutFileInfo(struct dllist *dl) #ifdef MID_VAX case MID_VAX: #endif +#ifdef MID_VAX1K + case MID_VAX1K: +#endif #ifdef MID_ALPHA case MID_ALPHA: #endif @@ -764,6 +779,11 @@ GetAOutFileInfo(struct dllist *dl) printf("vax"); break; #endif +#ifdef MID_VAX1K + case MID_VAX1K: + printf("vax 1k"); + break; +#endif #ifdef MID_ALPHA case MID_ALPHA: printf("alpha"); diff --git a/mopcopy/mopcopy.c b/mopcopy/mopcopy.c index dd13332..c4ae799 100644 --- a/mopcopy/mopcopy.c +++ b/mopcopy/mopcopy.c @@ -70,6 +70,9 @@ __RCSID("$NetBSD: mopcopy.c,v 1.7 2019/12/27 09:41:52 msaitoh Exp $"); #define NOAOUT #endif #if !defined(MID_VAX) +#define MID_VAX 150 +#endif +#if !defined(MID_VAX1K) #define MID_VAX 140 #endif @@ -126,7 +129,7 @@ main(int argc, char **argv) #ifndef NOAOUT case IMAGE_TYPE_AOUT: - if (dl.a_mid != MID_VAX) + if (dl.a_mid != MID_VAX && dl.a_mid != MID_VAX1K) printf("WARNING: `%s' is not a VAX image (mid=%d)\n", argv[1], dl.a_mid); i = dl.a_text + dl.a_text_fill + dl.a_data + dl.a_data_fill +