diff options
| author | Korey Sewell <ksewell@umich.edu> | 2011-02-18 14:35:15 -0500 |
|---|---|---|
| committer | Korey Sewell <ksewell@umich.edu> | 2011-02-18 14:35:15 -0500 |
| commit | 66bb732c04ccbe322586501f18423923672f335c (patch) | |
| tree | 32aed408a40b2f908d9a697d8b61815de705730b /src/cpu/o3/inst_queue_impl.hh | |
| parent | ab9c20cc78be49dbfc4bd8a4f479409094254e2a (diff) | |
| parent | e3d8d43b176d3a1eb69a5e5d16469d42292e514a (diff) | |
| download | gem5-66bb732c04ccbe322586501f18423923672f335c.tar.xz | |
m5: merge inorder/release-notes/make_release changes
Diffstat (limited to 'src/cpu/o3/inst_queue_impl.hh')
| -rw-r--r-- | src/cpu/o3/inst_queue_impl.hh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/cpu/o3/inst_queue_impl.hh b/src/cpu/o3/inst_queue_impl.hh index d6da4b818..aa21a0edc 100644 --- a/src/cpu/o3/inst_queue_impl.hh +++ b/src/cpu/o3/inst_queue_impl.hh @@ -749,7 +749,7 @@ InstructionQueue<Impl>::scheduleReadyInsts() DynInstPtr deferred_mem_inst; int total_deferred_mem_issued = 0; while (total_deferred_mem_issued < totalWidth && - (deferred_mem_inst = getDeferredMemInstToExecute()) != NULL) { + (deferred_mem_inst = getDeferredMemInstToExecute()) != 0) { issueToExecuteQueue->access(0)->size++; instsToExecute.push_back(deferred_mem_inst); total_deferred_mem_issued++; |