process.cc (12448:b299e560f1d8) | process.cc (13028:9a09c342891e) |
---|---|
1/* 2 * Copyright (c) 2004-2005 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; --- 165 unchanged lines hidden (view full) --- 174 175 copyStringArray(argv, argv_array_base, arg_data_base, initVirtMem); 176 177 copyStringArray(envp, envp_array_base, env_data_base, initVirtMem); 178 179 // Copy the aux vector 180 for (typename vector<auxv_t>::size_type x = 0; x < auxv.size(); x++) { 181 initVirtMem.writeBlob(auxv_array_base + x * 2 * intSize, | 1/* 2 * Copyright (c) 2004-2005 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; --- 165 unchanged lines hidden (view full) --- 174 175 copyStringArray(argv, argv_array_base, arg_data_base, initVirtMem); 176 177 copyStringArray(envp, envp_array_base, env_data_base, initVirtMem); 178 179 // Copy the aux vector 180 for (typename vector<auxv_t>::size_type x = 0; x < auxv.size(); x++) { 181 initVirtMem.writeBlob(auxv_array_base + x * 2 * intSize, |
182 (uint8_t*)&(auxv[x].a_type), intSize); | 182 (uint8_t*)&(auxv[x].getAuxType()), intSize); |
183 initVirtMem.writeBlob(auxv_array_base + (x * 2 + 1) * intSize, | 183 initVirtMem.writeBlob(auxv_array_base + (x * 2 + 1) * intSize, |
184 (uint8_t*)&(auxv[x].a_val), intSize); | 184 (uint8_t*)&(auxv[x].getAuxVal()), intSize); |
185 } 186 187 // Write out the terminating zeroed auxilliary vector 188 for (unsigned i = 0; i < 2; i++) { 189 const IntType zero = 0; 190 const Addr addr = auxv_array_base + 2 * intSize * (auxv.size() + i); 191 initVirtMem.writeBlob(addr, (uint8_t*)&zero, intSize); 192 } --- 38 unchanged lines hidden --- | 185 } 186 187 // Write out the terminating zeroed auxilliary vector 188 for (unsigned i = 0; i < 2; i++) { 189 const IntType zero = 0; 190 const Addr addr = auxv_array_base + 2 * intSize * (auxv.size() + i); 191 initVirtMem.writeBlob(addr, (uint8_t*)&zero, intSize); 192 } --- 38 unchanged lines hidden --- |