Browse Source

Plan 9 from Bell Labs 2013-07-19

David du Colombier 10 years ago
parent
commit
8d089687be
4 changed files with 13 additions and 2 deletions
  1. 9 0
      sys/src/9/pcboot/stub.c
  2. 1 1
      sys/src/9/port/devcons.c
  3. 1 1
      sys/src/9/port/rebootcmd.c
  4. 2 0
      sys/src/cmd/vl/asm.c

+ 9 - 0
sys/src/9/pcboot/stub.c

@@ -398,3 +398,12 @@ void
 fpsserestore(FPsave *)
 {
 }
+
+ulong
+l2be(long l)
+{
+	uchar *cp;
+
+	cp = (uchar*)&l;
+	return (cp[0]<<24) | (cp[1]<<16) | (cp[2]<<8) | cp[3];
+}

+ 1 - 1
sys/src/9/port/devcons.c

@@ -618,7 +618,7 @@ static Dirtab consdir[]={
 	"pid",		{Qpid},		NUMSIZE,	0444,
 	"ppid",		{Qppid},	NUMSIZE,	0444,
 	"random",	{Qrandom},	0,		0444,
-	"reboot",	{Qreboot},	0,		0664,
+	"reboot",	{Qreboot},	0,		0660,
 	"swap",		{Qswap},	0,		0664,
 	"sysname",	{Qsysname},	0,		0664,
 	"sysstat",	{Qsysstat},	0,		0666,

+ 1 - 1
sys/src/9/port/rebootcmd.c

@@ -79,7 +79,7 @@ rebootcmd(int argc, char *argv[])
 	}
 
 	/* round text out to page boundary */
-	rtext = ROUNDUP(entry+text, MAXBY2PG) - entry;
+	rtext = ROUNDUP(entry+text, BY2PG) - entry;
 	size = rtext + data;
 	p = malloc(size);
 	if(p == nil)

+ 2 - 0
sys/src/cmd/vl/asm.c

@@ -299,6 +299,7 @@ asmb(void)
 	case 3:
 	case 5:
 	case 6:
+	case 7:
 		OFFSET = HEADR+textsize;
 		seek(cout, OFFSET, 0);
 		break;
@@ -327,6 +328,7 @@ asmb(void)
 		case 1:
 		case 5:
 		case 6:
+		case 7:
 			OFFSET = HEADR+textsize+datsize;
 			seek(cout, OFFSET, 0);
 			break;