1.1 --- a/SimParams.c	Sat Feb 11 14:29:21 2012 -0800
     1.2 +++ b/SimParams.c	Mon Feb 13 15:10:30 2012 -0800
     1.3 @@ -1,155 +1,77 @@
     1.4  /*
     1.5 -
     1.6   *  Copyright 2009 OpenSourceStewardshipFoundation.org
     1.7 -
     1.8   *  Licensed under GNU General Public License version 2
     1.9 -
    1.10   *
    1.11 -
    1.12   * Author: seanhalle@yahoo.com
    1.13 -
    1.14   *
    1.15 -
    1.16   * Created on November 15, 2009, 2:35 AM
    1.17 -
    1.18   */
    1.19  
    1.20  
    1.21 -
    1.22  #include <malloc.h>
    1.23 -
    1.24  #include <stdlib.h>
    1.25  
    1.26  
    1.27 -
    1.28  #include "SimParams.h"
    1.29  
    1.30 -#include "ParamHelper/Param.h"
    1.31 -
    1.32 -
    1.33 -
    1.34 -
    1.35  
    1.36  uint8 *
    1.37 -
    1.38  read_Machine_Code_From_File( int numBytesInFile, char *machineCodeFileName );
    1.39  
    1.40  
    1.41 -
    1.42 - 
    1.43 -
    1.44  void
    1.45 -
    1.46  fill_sim_params_from_bag( SimulationParams *simParams, ParamBag *paramBag )
    1.47 -
    1.48   { char *guestAppFileName, *systemCodeFileName;
    1.49 -
    1.50     int numBytesInGuestApp, numBytesInSystemCode;
    1.51 -
    1.52     
    1.53 -
    1.54        ParamStruc *param;
    1.55  
    1.56        //param = getParamFromBag( "GuestApplicationFileName", paramBag );
    1.57 -
    1.58     guestAppFileName = param->strValue;
    1.59  
    1.60        //param = getParamFromBag( "numBytesInGuestApp", paramBag );
    1.61 -
    1.62     numBytesInGuestApp = param->intValue;
    1.63  
    1.64 -
    1.65 -
    1.66     simParams->guestApp =
    1.67 -
    1.68      read_Machine_Code_From_File( numBytesInGuestApp, guestAppFileName );
    1.69  
    1.70 -
    1.71 -
    1.72        //param = getParamFromBag( "SystemCodeFileName", paramBag );
    1.73 -
    1.74     systemCodeFileName = param->strValue;
    1.75  
    1.76        //param = getParamFromBag( "numBytesInSystemCode", paramBag );
    1.77 -
    1.78     numBytesInSystemCode = param->intValue;
    1.79  
    1.80 -
    1.81 -
    1.82     simParams->systemCode =
    1.83 -
    1.84      read_Machine_Code_From_File( numBytesInSystemCode, systemCodeFileName );
    1.85  
    1.86 -
    1.87 -
    1.88 -
    1.89 -
    1.90        //param = getParamFromBag( "numNodes", paramBag );
    1.91 -
    1.92     simParams->numNodes = param->intValue;
    1.93 -
    1.94 -
    1.95 -
    1.96   }
    1.97  
    1.98  
    1.99 -
   1.100 -
   1.101 -
   1.102 -
   1.103 -
   1.104  uint8 *
   1.105 -
   1.106  read_Machine_Code_From_File( int numBytesInFile, char *machineCodeFileName )
   1.107 -
   1.108   { int byte;
   1.109 -
   1.110     FILE  *file;
   1.111 -
   1.112     char  *machineCode = malloc( numBytesInFile );
   1.113 -
   1.114     if( machineCode == NULL ) printf( "\nno mem for machine code\n" );
   1.115  
   1.116 -   
   1.117 -
   1.118     file = fopen( machineCodeFileName, "r" );
   1.119 -
   1.120     if( file == NULL ) { printf( "\nCouldn't open file!!\n"); exit(1);}
   1.121  
   1.122 -
   1.123 -
   1.124     fseek( file, 0, SEEK_SET );
   1.125 -
   1.126     for( byte = 0; byte < numBytesInFile; byte++ )
   1.127 -
   1.128      {
   1.129 -
   1.130        if( feof( file ) )  printf( "file ran out too soon" );
   1.131 -
   1.132  //      machineCode[byte] = getchar( file );
   1.133 -
   1.134 -      
   1.135 -
   1.136      }
   1.137 -
   1.138     return machineCode;
   1.139 -
   1.140   }
   1.141  
   1.142  
   1.143 -
   1.144 -
   1.145 -
   1.146 - //==========================================================================
   1.147 -
   1.148 +//==========================================================================
   1.149  void
   1.150 -
   1.151  printSimResults( SimulationResults simResults )
   1.152 -
   1.153   { 
   1.154 -
   1.155   }
   1.156  
   1.157 -
   1.158 -
   1.159 -