thread_state.hh (2674:6d4afef73a20) | thread_state.hh (2678:1f86b91dc3bb) |
---|---|
1/* 2 * Copyright (c) 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; --- 72 unchanged lines hidden (view full) --- 81 bool trapPending; 82 83#if FULL_SYSTEM 84 O3ThreadState(FullCPU *_cpu, int _thread_num, FunctionalMemory *_mem) 85 : ThreadState(-1, _thread_num, _mem), 86 inSyscall(0), trapPending(0) 87 { } 88#else | 1/* 2 * Copyright (c) 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; --- 72 unchanged lines hidden (view full) --- 81 bool trapPending; 82 83#if FULL_SYSTEM 84 O3ThreadState(FullCPU *_cpu, int _thread_num, FunctionalMemory *_mem) 85 : ThreadState(-1, _thread_num, _mem), 86 inSyscall(0), trapPending(0) 87 { } 88#else |
89 O3ThreadState(FullCPU *_cpu, int _thread_num, Process *_process, int _asid) 90 : ThreadState(-1, _thread_num, NULL, _process, _asid), | 89 O3ThreadState(FullCPU *_cpu, int _thread_num, Process *_process, int _asid, 90 MemObject *mem) 91 : ThreadState(-1, _thread_num, mem, _process, _asid), |
91 cpu(_cpu), inSyscall(0), trapPending(0) 92 { } | 92 cpu(_cpu), inSyscall(0), trapPending(0) 93 { } |
93 94 O3ThreadState(FullCPU *_cpu, int _thread_num, FunctionalMemory *_mem, 95 int _asid) 96 : ThreadState(-1, _thread_num, _mem, NULL, _asid), 97 cpu(_cpu), inSyscall(0), trapPending(0) 98 { } | |
99#endif 100 101 /** Pointer to the ExecContext of this thread. @todo: Don't call 102 this a proxy.*/ 103 ExecContext *xcProxy; 104 105 /** Returns a pointer to the XC of this thread. */ 106 ExecContext *getXCProxy() { return xcProxy; } --- 27 unchanged lines hidden --- | 94#endif 95 96 /** Pointer to the ExecContext of this thread. @todo: Don't call 97 this a proxy.*/ 98 ExecContext *xcProxy; 99 100 /** Returns a pointer to the XC of this thread. */ 101 ExecContext *getXCProxy() { return xcProxy; } --- 27 unchanged lines hidden --- |