head 1.2; access; symbols pkgsrc-2026Q1:1.2.0.168 pkgsrc-2026Q1-base:1.2 pkgsrc-2025Q4:1.2.0.166 pkgsrc-2025Q4-base:1.2 pkgsrc-2025Q3:1.2.0.164 pkgsrc-2025Q3-base:1.2 pkgsrc-2025Q2:1.2.0.162 pkgsrc-2025Q2-base:1.2 pkgsrc-2025Q1:1.2.0.160 pkgsrc-2025Q1-base:1.2 pkgsrc-2024Q4:1.2.0.158 pkgsrc-2024Q4-base:1.2 pkgsrc-2024Q3:1.2.0.156 pkgsrc-2024Q3-base:1.2 pkgsrc-2024Q2:1.2.0.154 pkgsrc-2024Q2-base:1.2 pkgsrc-2024Q1:1.2.0.152 pkgsrc-2024Q1-base:1.2 pkgsrc-2023Q4:1.2.0.150 pkgsrc-2023Q4-base:1.2 pkgsrc-2023Q3:1.2.0.148 pkgsrc-2023Q3-base:1.2 pkgsrc-2023Q2:1.2.0.146 pkgsrc-2023Q2-base:1.2 pkgsrc-2023Q1:1.2.0.144 pkgsrc-2023Q1-base:1.2 pkgsrc-2022Q4:1.2.0.142 pkgsrc-2022Q4-base:1.2 pkgsrc-2022Q3:1.2.0.140 pkgsrc-2022Q3-base:1.2 pkgsrc-2022Q2:1.2.0.138 pkgsrc-2022Q2-base:1.2 pkgsrc-2022Q1:1.2.0.136 pkgsrc-2022Q1-base:1.2 pkgsrc-2021Q4:1.2.0.134 pkgsrc-2021Q4-base:1.2 pkgsrc-2021Q3:1.2.0.132 pkgsrc-2021Q3-base:1.2 pkgsrc-2021Q2:1.2.0.130 pkgsrc-2021Q2-base:1.2 pkgsrc-2021Q1:1.2.0.128 pkgsrc-2021Q1-base:1.2 pkgsrc-2020Q4:1.2.0.126 pkgsrc-2020Q4-base:1.2 pkgsrc-2020Q3:1.2.0.124 pkgsrc-2020Q3-base:1.2 pkgsrc-2020Q2:1.2.0.120 pkgsrc-2020Q2-base:1.2 pkgsrc-2020Q1:1.2.0.100 pkgsrc-2020Q1-base:1.2 pkgsrc-2019Q4:1.2.0.122 pkgsrc-2019Q4-base:1.2 pkgsrc-2019Q3:1.2.0.118 pkgsrc-2019Q3-base:1.2 pkgsrc-2019Q2:1.2.0.116 pkgsrc-2019Q2-base:1.2 pkgsrc-2019Q1:1.2.0.114 pkgsrc-2019Q1-base:1.2 pkgsrc-2018Q4:1.2.0.112 pkgsrc-2018Q4-base:1.2 pkgsrc-2018Q3:1.2.0.110 pkgsrc-2018Q3-base:1.2 pkgsrc-2018Q2:1.2.0.108 pkgsrc-2018Q2-base:1.2 pkgsrc-2018Q1:1.2.0.106 pkgsrc-2018Q1-base:1.2 pkgsrc-2017Q4:1.2.0.104 pkgsrc-2017Q4-base:1.2 pkgsrc-2017Q3:1.2.0.102 pkgsrc-2017Q3-base:1.2 pkgsrc-2017Q2:1.2.0.98 pkgsrc-2017Q2-base:1.2 pkgsrc-2017Q1:1.2.0.96 pkgsrc-2017Q1-base:1.2 pkgsrc-2016Q4:1.2.0.94 pkgsrc-2016Q4-base:1.2 pkgsrc-2016Q3:1.2.0.92 pkgsrc-2016Q3-base:1.2 pkgsrc-2016Q2:1.2.0.90 pkgsrc-2016Q2-base:1.2 pkgsrc-2016Q1:1.2.0.88 pkgsrc-2016Q1-base:1.2 pkgsrc-2015Q4:1.2.0.86 pkgsrc-2015Q4-base:1.2 pkgsrc-2015Q3:1.2.0.84 pkgsrc-2015Q3-base:1.2 pkgsrc-2015Q2:1.2.0.82 pkgsrc-2015Q2-base:1.2 pkgsrc-2015Q1:1.2.0.80 pkgsrc-2015Q1-base:1.2 pkgsrc-2014Q4:1.2.0.78 pkgsrc-2014Q4-base:1.2 pkgsrc-2014Q3:1.2.0.76 pkgsrc-2014Q3-base:1.2 pkgsrc-2014Q2:1.2.0.74 pkgsrc-2014Q2-base:1.2 pkgsrc-2014Q1:1.2.0.72 pkgsrc-2014Q1-base:1.2 pkgsrc-2013Q4:1.2.0.70 pkgsrc-2013Q4-base:1.2 pkgsrc-2013Q3:1.2.0.68 pkgsrc-2013Q3-base:1.2 pkgsrc-2013Q2:1.2.0.66 pkgsrc-2013Q2-base:1.2 pkgsrc-2013Q1:1.2.0.64 pkgsrc-2013Q1-base:1.2 pkgsrc-2012Q4:1.2.0.62 pkgsrc-2012Q4-base:1.2 pkgsrc-2012Q3:1.2.0.60 pkgsrc-2012Q3-base:1.2 pkgsrc-2012Q2:1.2.0.58 pkgsrc-2012Q2-base:1.2 pkgsrc-2012Q1:1.2.0.56 pkgsrc-2012Q1-base:1.2 pkgsrc-2011Q4:1.2.0.54 pkgsrc-2011Q4-base:1.2 pkgsrc-2011Q3:1.2.0.52 pkgsrc-2011Q3-base:1.2 pkgsrc-2011Q2:1.2.0.50 pkgsrc-2011Q2-base:1.2 pkgsrc-2011Q1:1.2.0.48 pkgsrc-2011Q1-base:1.2 pkgsrc-2010Q4:1.2.0.46 pkgsrc-2010Q4-base:1.2 pkgsrc-2010Q3:1.2.0.44 pkgsrc-2010Q3-base:1.2 pkgsrc-2010Q2:1.2.0.42 pkgsrc-2010Q2-base:1.2 pkgsrc-2010Q1:1.2.0.40 pkgsrc-2010Q1-base:1.2 pkgsrc-2009Q4:1.2.0.38 pkgsrc-2009Q4-base:1.2 pkgsrc-2009Q3:1.2.0.36 pkgsrc-2009Q3-base:1.2 pkgsrc-2009Q2:1.2.0.34 pkgsrc-2009Q2-base:1.2 pkgsrc-2009Q1:1.2.0.32 pkgsrc-2009Q1-base:1.2 pkgsrc-2008Q4:1.2.0.30 pkgsrc-2008Q4-base:1.2 pkgsrc-2008Q3:1.2.0.28 pkgsrc-2008Q3-base:1.2 cube-native-xorg:1.2.0.26 cube-native-xorg-base:1.2 pkgsrc-2008Q2:1.2.0.24 pkgsrc-2008Q2-base:1.2 cwrapper:1.2.0.22 pkgsrc-2008Q1:1.2.0.20 pkgsrc-2008Q1-base:1.2 pkgsrc-2007Q4:1.2.0.18 pkgsrc-2007Q4-base:1.2 pkgsrc-2007Q3:1.2.0.16 pkgsrc-2007Q3-base:1.2 pkgsrc-2007Q2:1.2.0.14 pkgsrc-2007Q2-base:1.2 pkgsrc-2007Q1:1.2.0.12 pkgsrc-2007Q1-base:1.2 pkgsrc-2006Q4:1.2.0.10 pkgsrc-2006Q4-base:1.2 pkgsrc-2006Q3:1.2.0.8 pkgsrc-2006Q3-base:1.2 pkgsrc-2006Q2:1.2.0.6 pkgsrc-2006Q2-base:1.2 pkgsrc-2006Q1:1.2.0.4 pkgsrc-2006Q1-base:1.2 pkgsrc-2005Q4:1.2.0.2 pkgsrc-2005Q4-base:1.2 pkgsrc-2005Q3:1.1.0.10 pkgsrc-2005Q3-base:1.1 pkgsrc-2005Q2:1.1.0.8 pkgsrc-2005Q2-base:1.1 pkgsrc-2005Q1:1.1.0.6 pkgsrc-2005Q1-base:1.1 pkgsrc-2004Q4:1.1.0.4 pkgsrc-2004Q4-base:1.1 pkgsrc-2004Q3:1.1.0.2 pkgsrc-2004Q3-base:1.1; locks; strict; comment @# @; 1.2 date 2005.11.03.21.51.57; author rillig; state Exp; branches; next 1.1; 1.1 date 2004.08.12.19.59.51; author agc; state Exp; branches; next ; desc @@ 1.2 log @Fixed wrong use of WRKSRC. @ text @$NetBSD: patch-ae,v 1.1 2004/08/12 19:59:51 agc Exp $ --- src/core.cpp 2004/08/12 17:16:45 1.1 +++ src/core.cpp 2004/08/12 17:17:18 @@@@ -26,7 +26,7 @@@@ #include "core.h" #include "isa.h" #include -#include +#include #include "disarm.h" #ifndef ARM6 #include "booth.h" @@@@ -34,6 +34,8 @@@@ #include "memory.cpp" +using namespace std; + static const char* mode_str[16] = {"reset", "fiq", "irq", "svc", NULL, NULL, NULL, "abort", NULL, NULL, NULL, "undef", @@@@ -4031,22 +4033,29 @@@@ { char str[80]; - cout.form("-------------------------------------------------------------------------------\n"); - cout.form("SWARM Core debug dump\n\n"); + cout << "-------------------------------------------------------------------------------\n"; + cout << "SWARM Core debug dump\n\n"; - cout.form("Registers:"); + cout << "Registers:"; for (int j = 0; j < 4; j++) { - for (int i = 0; i < 4; i++) - cout.form(" 0x%08X", m_regsWorking[i + (j * 4)]); - cout.form("\n\t "); + for (int i = 0; i < 4; i++) { + cout << " "; + cout << hex << m_regsWorking[i + (j * 4)]; + } + cout << "\n\t "; } - cout.form(" 0x%08X", m_regsWorking[16]); + cout << " "; + cout << hex << m_regsWorking[16]; - if (m_mode == M_FIQ) - cout.form("\tSPSR_%s[0x%08x]\n\n", mode_str[m_mode & 0xF], m_regsFiq[7]); - else if ((m_mode == M_USER) || (m_mode == M_SYSTEM)) - cout.form("\n\n"); + if (m_mode == M_FIQ) { + cout << "\tSPSR_"; + cout << mode_str[m_mode & 0xF]; + cout << "["; + cout << hex << m_regsFiq[7]; + cout << "]\n\n"; + } else if ((m_mode == M_USER) || (m_mode == M_SYSTEM)) + cout << "\n\n"; else { uint32_t* temp; @@@@ -4060,31 +4069,50 @@@@ temp = NULL; break; // ??? } - if (temp != NULL) - cout.form("\tSPSR_%s[0x%08x]\n\n", mode_str[m_mode & 0xF], temp[2]); + if (temp != NULL) { + cout << "\tSPSR_"; + cout << mode_str[m_mode & 0xF]; + cout << "["; + cout << hex << temp[2]; + cout << "]\n\n"; + } } - cout.form("Instruction Pipe (top is current instruction):\n"); + cout << "Instruction Pipe (top is current instruction):\n"; for (int i = 2; i > 0; i--) { - cout.form("\t0x%08X - ", m_iPipe[i]); + cout << "\t0x"; + cout << hex << m_iPipe[i]; + cout << " - "; memset(str, 0, 80); CDisarm::Decode(m_iPipe[i], str); - cout.form("%s\n", str); + cout << str; + cout << "\n"; } if (m_busCurrent != NULL) { - cout.form("\t0x%08X - ", m_busCurrent->Din); + cout << "\t0x"; + cout << hex << m_busCurrent->Din; + cout << " - "; memset(str, 0, 80); CDisarm::Decode(m_busCurrent->Din, str); - cout.form("%s (suspect if bad address error)\n", str); + cout << str; + cout << " (suspect if bad address error)\n"; } - cout.form("Instruction Stage last executed - %d\n\n", m_nCtrlCur); - - cout.form("DIn reg = 0x%08X DOut reg = 0x%08X Addr reg = 0x%08X\n", - m_regDataIn, m_regDataOut, m_regAddr); + cout << "Instruction Stage last executed - "; + cout << dec << m_nCtrlCur; + cout << "\n\n"; + + cout << "DIn reg = 0x"; + cout << hex << m_regDataIn; + cout << " DOut reg = 0x"; + cout << hex << m_regDataOut; + cout << " Addr reg = 0x"; + cout << hex << m_regAddr; + cout << "\n"; + cout << dec; - cout.form("-------------------------------------------------------------------------------\n"); + cout << "-------------------------------------------------------------------------------\n"; } @ 1.1 log @Make this package build with recent C++. With thanks to Bill Squier, Krister Walfridsson and Soda for their help. mmm, progress... @ text @d1 1 a1 1 $NetBSD$ d3 2 a4 2 --- core.cpp 2004/08/12 17:16:45 1.1 +++ core.cpp 2004/08/12 17:17:18 @