process.cc (5289:ca5390e654b8) process.cc (5567:8fc3b004b0df)
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;

--- 91 unchanged lines hidden (view full) ---

100#include "sim/process_impl.hh"
101#include "sim/system.hh"
102
103using namespace std;
104using namespace X86ISA;
105
106M5_64_auxv_t::M5_64_auxv_t(int64_t type, int64_t val)
107{
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;

--- 91 unchanged lines hidden (view full) ---

100#include "sim/process_impl.hh"
101#include "sim/system.hh"
102
103using namespace std;
104using namespace X86ISA;
105
106M5_64_auxv_t::M5_64_auxv_t(int64_t type, int64_t val)
107{
108 a_type = TheISA::htog(type);
109 a_val = TheISA::htog(val);
108 a_type = X86ISA::htog(type);
109 a_val = X86ISA::htog(val);
110}
111
112X86LiveProcess::X86LiveProcess(LiveProcessParams * params,
113 ObjectFile *objFile)
114 : LiveProcess(params, objFile)
115{
116 brk_point = objFile->dataBase() + objFile->dataSize() + objFile->bssSize();
117 brk_point = roundUp(brk_point, VMPageSize);

--- 301 unchanged lines hidden (view full) ---

419 DPRINTF(X86, "0x%x - argv array\n", argv_array_base);
420 DPRINTF(X86, "0x%x - argc \n", argc_base);
421 DPRINTF(X86, "0x%x - stack min\n", stack_min);
422
423 // write contents to stack
424
425 // figure out argc
426 uint64_t argc = argv.size();
110}
111
112X86LiveProcess::X86LiveProcess(LiveProcessParams * params,
113 ObjectFile *objFile)
114 : LiveProcess(params, objFile)
115{
116 brk_point = objFile->dataBase() + objFile->dataSize() + objFile->bssSize();
117 brk_point = roundUp(brk_point, VMPageSize);

--- 301 unchanged lines hidden (view full) ---

419 DPRINTF(X86, "0x%x - argv array\n", argv_array_base);
420 DPRINTF(X86, "0x%x - argc \n", argc_base);
421 DPRINTF(X86, "0x%x - stack min\n", stack_min);
422
423 // write contents to stack
424
425 // figure out argc
426 uint64_t argc = argv.size();
427 uint64_t guestArgc = TheISA::htog(argc);
427 uint64_t guestArgc = X86ISA::htog(argc);
428
429 //Write out the sentry void *
430 uint64_t sentry_NULL = 0;
431 initVirtMem->writeBlob(sentry_base,
432 (uint8_t*)&sentry_NULL, sentry_size);
433
434 //Write the file name
435 initVirtMem->writeString(file_name_base, filename.c_str());

--- 39 unchanged lines hidden --- 		428
429 //Write out the sentry void *
430 uint64_t sentry_NULL = 0;
431 initVirtMem->writeBlob(sentry_base,
432 (uint8_t*)&sentry_NULL, sentry_size);
433
434 //Write the file name
435 initVirtMem->writeString(file_name_base, filename.c_str());

--- 39 unchanged lines hidden ---