pkgsrc/emulators/swarm/patches/patch-ag
2005-11-03 21:51:57 +00:00

57 lines
1.6 KiB
Text

$NetBSD: patch-ag,v 1.2 2005/11/03 21:51:57 rillig Exp $
--- src/syscopro.cpp 2004/08/12 18:34:07 1.1
+++ src/syscopro.cpp 2004/08/12 18:37:39
@@ -26,10 +26,12 @@
#include "syscopro.h"
#include <string.h>
#include "isa.h"
-#include <iostream.h>
+#include <iostream>
#include "memory.cpp"
+using namespace std;
+
// Defines a dull ARM7 type processor ID. Make = ARM, Arch = 3, rest NULL
#define SWARM_ID 0x41007000
@@ -486,22 +488,28 @@
{
char str[80];
- cout.form("-------------------------------------------------------------------------------\n");
- cout.form("System coprocessor debug dump\n\n");
+ cout << "-------------------------------------------------------------------------------\n";
+ cout << "System coprocessor 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 << " 0x";
+ cout << hex << m_regsWorking[i + (j * 4)];
+ }
+ cout << "\n\t ";
}
- cout.form("\n");
+ cout << "\n";
- cout.form("DIn reg = 0x%08X DOut reg = 0x%08X\n",
- m_regDataIn, m_regDataOut);
+ cout << "DIn reg = 0x";
+ cout << hex << m_regDataIn;
+ cout << " DOut reg = 0x",
+ cout << hex << m_regDataOut;
+ cout << "\n";
+ cout << dec;
- cout.form("-------------------------------------------------------------------------------\n");
+ cout << "-------------------------------------------------------------------------------\n";
}