system.cc (7445:dfd04ffc1773) | system.cc (7580:6f77f379a594) |
---|---|
1/* 2 * Copyright (c) 2003-2006 The Regents of The University of Michigan 3 * All rights reserved. 4 * 5 * Redistribution and use in source and binary forms, with or without 6 * modification, are permitted provided that the following conditions are 7 * met: redistributions of source code must retain the above copyright 8 * notice, this list of conditions and the following disclaimer; --- 52 unchanged lines hidden (view full) --- 61int System::numSystemsRunning = 0; 62 63System::System(Params *p) 64 : SimObject(p), physmem(p->physmem), _numContexts(0), 65#if FULL_SYSTEM 66 init_param(p->init_param), 67 functionalPort(p->name + "-fport"), 68 virtPort(p->name + "-vport"), | 1/* 2 * Copyright (c) 2003-2006 The Regents of The University of Michigan 3 * All rights reserved. 4 * 5 * Redistribution and use in source and binary forms, with or without 6 * modification, are permitted provided that the following conditions are 7 * met: redistributions of source code must retain the above copyright 8 * notice, this list of conditions and the following disclaimer; --- 52 unchanged lines hidden (view full) --- 61int System::numSystemsRunning = 0; 62 63System::System(Params *p) 64 : SimObject(p), physmem(p->physmem), _numContexts(0), 65#if FULL_SYSTEM 66 init_param(p->init_param), 67 functionalPort(p->name + "-fport"), 68 virtPort(p->name + "-vport"), |
69 loadAddrMask(p->load_addr_mask), |
|
69#else 70 page_ptr(0), 71 next_PID(0), 72#endif 73 memoryMode(p->mem_mode), _params(p) 74{ 75 // add self to global system list 76 systemList.push_back(this); --- 27 unchanged lines hidden (view full) --- 104 // Load kernel code 105 kernel = createObjectFile(params()->kernel); 106 inform("kernel located at: %s", params()->kernel); 107 108 if (kernel == NULL) 109 fatal("Could not load kernel file %s", params()->kernel); 110 111 // Load program sections into memory | 70#else 71 page_ptr(0), 72 next_PID(0), 73#endif 74 memoryMode(p->mem_mode), _params(p) 75{ 76 // add self to global system list 77 systemList.push_back(this); --- 27 unchanged lines hidden (view full) --- 105 // Load kernel code 106 kernel = createObjectFile(params()->kernel); 107 inform("kernel located at: %s", params()->kernel); 108 109 if (kernel == NULL) 110 fatal("Could not load kernel file %s", params()->kernel); 111 112 // Load program sections into memory |
112 kernel->loadSections(&functionalPort, LoadAddrMask); | 113 kernel->loadSections(&functionalPort, loadAddrMask); |
113 114 // setup entry points 115 kernelStart = kernel->textBase(); 116 kernelEnd = kernel->bssBase() + kernel->bssSize(); 117 kernelEntry = kernel->entryPoint(); 118 119 // load symbols 120 if (!kernel->loadGlobalSymbols(kernelSymtab)) --- 206 unchanged lines hidden --- | 114 115 // setup entry points 116 kernelStart = kernel->textBase(); 117 kernelEnd = kernel->bssBase() + kernel->bssSize(); 118 kernelEntry = kernel->entryPoint(); 119 120 // load symbols 121 if (!kernel->loadGlobalSymbols(kernelSymtab)) --- 206 unchanged lines hidden --- |