1.1 --- a/src/Application/SimParams.c	Mon Dec 05 12:24:44 2011 +0100
     1.2 +++ b/src/Application/SimParams.c	Tue Dec 06 18:46:42 2011 +0100
     1.3 @@ -1,1 +1,155 @@
     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 void
   1.149 
   1.150 printSimResults( SimulationResults simResults )
   1.151 
   1.152  { 
   1.153 
   1.154  }
   1.155 
   1.156 
   1.157 
   1.158 \ No newline at end of file
   1.159 +/*
   1.160 +
   1.161 + *  Copyright 2009 OpenSourceStewardshipFoundation.org
   1.162 +
   1.163 + *  Licensed under GNU General Public License version 2
   1.164 +
   1.165 + *
   1.166 +
   1.167 + * Author: seanhalle@yahoo.com
   1.168 +
   1.169 + *
   1.170 +
   1.171 + * Created on November 15, 2009, 2:35 AM
   1.172 +
   1.173 + */
   1.174 +
   1.175 +
   1.176 +
   1.177 +#include <malloc.h>
   1.178 +
   1.179 +#include <stdlib.h>
   1.180 +
   1.181 +
   1.182 +
   1.183 +#include "SimParams.h"
   1.184 +
   1.185 +#include "ParamHelper/Param.h"
   1.186 +
   1.187 +
   1.188 +
   1.189 +
   1.190 +
   1.191 +uint8 *
   1.192 +
   1.193 +read_Machine_Code_From_File( int numBytesInFile, char *machineCodeFileName );
   1.194 +
   1.195 +
   1.196 +
   1.197 + 
   1.198 +
   1.199 +void
   1.200 +
   1.201 +fill_sim_params_from_bag( SimulationParams *simParams, ParamBag *paramBag )
   1.202 +
   1.203 + { char *guestAppFileName, *systemCodeFileName;
   1.204 +
   1.205 +   int numBytesInGuestApp, numBytesInSystemCode;
   1.206 +
   1.207 +   
   1.208 +
   1.209 +      ParamStruc *param;
   1.210 +
   1.211 +      //param = getParamFromBag( "GuestApplicationFileName", paramBag );
   1.212 +
   1.213 +   guestAppFileName = param->strValue;
   1.214 +
   1.215 +      //param = getParamFromBag( "numBytesInGuestApp", paramBag );
   1.216 +
   1.217 +   numBytesInGuestApp = param->intValue;
   1.218 +
   1.219 +
   1.220 +
   1.221 +   simParams->guestApp =
   1.222 +
   1.223 +    read_Machine_Code_From_File( numBytesInGuestApp, guestAppFileName );
   1.224 +
   1.225 +
   1.226 +
   1.227 +      //param = getParamFromBag( "SystemCodeFileName", paramBag );
   1.228 +
   1.229 +   systemCodeFileName = param->strValue;
   1.230 +
   1.231 +      //param = getParamFromBag( "numBytesInSystemCode", paramBag );
   1.232 +
   1.233 +   numBytesInSystemCode = param->intValue;
   1.234 +
   1.235 +
   1.236 +
   1.237 +   simParams->systemCode =
   1.238 +
   1.239 +    read_Machine_Code_From_File( numBytesInSystemCode, systemCodeFileName );
   1.240 +
   1.241 +
   1.242 +
   1.243 +
   1.244 +
   1.245 +      //param = getParamFromBag( "numNodes", paramBag );
   1.246 +
   1.247 +   simParams->numNodes = param->intValue;
   1.248 +
   1.249 +
   1.250 +
   1.251 + }
   1.252 +
   1.253 +
   1.254 +
   1.255 +
   1.256 +
   1.257 +
   1.258 +
   1.259 +uint8 *
   1.260 +
   1.261 +read_Machine_Code_From_File( int numBytesInFile, char *machineCodeFileName )
   1.262 +
   1.263 + { int byte;
   1.264 +
   1.265 +   FILE  *file;
   1.266 +
   1.267 +   char  *machineCode = malloc( numBytesInFile );
   1.268 +
   1.269 +   if( machineCode == NULL ) printf( "\nno mem for machine code\n" );
   1.270 +
   1.271 +   
   1.272 +
   1.273 +   file = fopen( machineCodeFileName, "r" );
   1.274 +
   1.275 +   if( file == NULL ) { printf( "\nCouldn't open file!!\n"); exit(1);}
   1.276 +
   1.277 +
   1.278 +
   1.279 +   fseek( file, 0, SEEK_SET );
   1.280 +
   1.281 +   for( byte = 0; byte < numBytesInFile; byte++ )
   1.282 +
   1.283 +    {
   1.284 +
   1.285 +      if( feof( file ) )  printf( "file ran out too soon" );
   1.286 +
   1.287 +//      machineCode[byte] = getchar( file );
   1.288 +
   1.289 +      
   1.290 +
   1.291 +    }
   1.292 +
   1.293 +   return machineCode;
   1.294 +
   1.295 + }
   1.296 +
   1.297 +
   1.298 +
   1.299 +
   1.300 +
   1.301 + //==========================================================================
   1.302 +
   1.303 +void
   1.304 +
   1.305 +printSimResults( SimulationResults simResults )
   1.306 +
   1.307 + { 
   1.308 +
   1.309 + }
   1.310 +
   1.311 +
   1.312 +
   1.313 +