From ad63f2e67e119081217985bf4701d76a849025d2 Mon Sep 17 00:00:00 2001 From: Ali Saidi Date: Wed, 23 Jun 2004 15:12:15 -0400 Subject: [PATCH] Copy variables over one at a time rather than copying 4 bytes at a time. Easiest way to deal with the endian issue. --- system/alpha/console/console.c | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/system/alpha/console/console.c b/system/alpha/console/console.c index afdf00362..61e765411 100644 --- a/system/alpha/console/console.c +++ b/system/alpha/console/console.c @@ -154,12 +154,31 @@ main(int argc, char **argv) simosConf.last_offset = k1Conf->last_offset; printf(" Got simosConfiguration %d \n",simosConf.last_offset); - for (i=1;i<=simosConf.last_offset/4;i++) { +/* for (i=1;i<=simosConf.last_offset/4;i++) { ui *k1ptr = (ui*)k1Conf + i; ui *ksegptr = (ui*)(&simosConf.last_offset)+i; *ksegptr = *k1ptr; - } + }*/ + + simosConf.last_offset = k1Conf->last_offset; + simosConf.version = k1Conf->version; + simosConf.numCPUs = k1Conf->numCPUs; + simosConf.intrClockFrequency = k1Conf->intrClockFrequency; + simosConf.cpuClock = k1Conf->cpuClock; + simosConf.mem_size = k1Conf->mem_size; + simosConf.kernStart = k1Conf->kernStart; + simosConf.kernEnd = k1Conf->kernEnd; + simosConf.entryPoint = k1Conf->entryPoint; + simosConf.diskUnit = k1Conf->diskUnit; + simosConf.diskCount = k1Conf->diskCount; + simosConf.diskPAddr = k1Conf->diskPAddr; + simosConf.diskBlock = k1Conf->diskBlock; + simosConf.diskOperation = k1Conf->diskOperation; + simosConf.outputChar = k1Conf->outputChar; + simosConf.inputChar = k1Conf->inputChar; + simosConf.bootStrapImpure = k1Conf->bootStrapImpure; + simosConf.bootStrapCPU = k1Conf->bootStrapCPU; if (simosConf.version != ALPHA_ACCESS_VERSION) { panic("Console version mismatch. Console expects %d. SimOS has %d \n",