43a44
> #include "debug/ExecAll.hh"
62c63
< if (IsOn(ExecTicks))
---
> if (Debug::ExecTicks)
67c68
< if (IsOn(ExecSpeculative))
---
> if (Debug::ExecSpeculative)
70c71
< if (IsOn(ExecThread))
---
> if (Debug::ExecThread)
76,77c77
< if (debugSymbolTable
< && IsOn(ExecSymbol)
---
> if (debugSymbolTable && Debug::ExecSymbol
107c107
< if (IsOn(ExecOpClass)) {
---
> if (Debug::ExecOpClass) {
111c111
< if (IsOn(ExecResult) && predicate == false) {
---
> if (Debug::ExecResult && predicate == false) {
115c115
< if (IsOn(ExecResult) && data_status != DataInvalid) {
---
> if (Debug::ExecResult && data_status != DataInvalid) {
119c119
< if (IsOn(ExecEffAddr) && addr_valid)
---
> if (Debug::ExecEffAddr && addr_valid)
122c122
< if (IsOn(ExecFetchSeq) && fetch_seq_valid)
---
> if (Debug::ExecFetchSeq && fetch_seq_valid)
125c125
< if (IsOn(ExecCPSeq) && cp_seq_valid)
---
> if (Debug::ExecCPSeq && cp_seq_valid)
146,149c146,149
< if (IsOn(ExecMacro) && staticInst->isMicroop() &&
< ((IsOn(ExecMicro) &&
< macroStaticInst && staticInst->isFirstMicroop()) ||
< (!IsOn(ExecMicro) &&
---
> if (Debug::ExecMacro && staticInst->isMicroop() &&
> ((Debug::ExecMicro &&
> macroStaticInst && staticInst->isFirstMicroop()) ||
> (!Debug::ExecMicro &&
153c153
< if (IsOn(ExecMicro) || !staticInst->isMicroop()) {
---
> if (Debug::ExecMicro || !staticInst->isMicroop()) {