From a830ea76270b7894a03922a172d58bfaefbc827f Mon Sep 17 00:00:00 2001 From: Vas Crabb Date: Tue, 1 Mar 2016 06:45:41 +1100 Subject: * Support *n conversion in stream_format/string_format * Make stream_format return characters printed * Add iostreams with std::vector storage * Move to type-safe templates for logerror and popmessage * Remove now-unnecessary I64FMT from calls to logerror/popmessage * Put some lib/util stuff in util:: namespace * Some fixes to Japanese translation --- src/devices/cpu/alto2/alto2cpu.cpp | 81 +++++++++++++++----------------------- 1 file changed, 32 insertions(+), 49 deletions(-) (limited to 'src/devices/cpu/alto2/alto2cpu.cpp') diff --git a/src/devices/cpu/alto2/alto2cpu.cpp b/src/devices/cpu/alto2/alto2cpu.cpp index fb2d1700d5f..5df4ce44675 100644 --- a/src/devices/cpu/alto2/alto2cpu.cpp +++ b/src/devices/cpu/alto2/alto2cpu.cpp @@ -20,55 +20,38 @@ const device_type ALTO2 = &device_creator; // LOGGING AND DEBUGGING //************************************************************************** #if ALTO2_DEBUG -int g_log_types = LOG_DISK | LOG_ETH; -int g_log_level = 8; -bool g_log_newline = true; - -void logprintf(device_t *device, int type, int level, const char* format, ...) -{ - static const char* type_name[] = { - "[CPU]", - "[EMU]", - "[T01]", - "[T02]", - "[T03]", - "[KSEC]", - "[T05]", - "[T06]", - "[ETH]", - "[MRT]", - "[DWT]", - "[CURT]", - "[DHT]", - "[DVT]", - "[PART]", - "[KWD]", - "[T17]", - "[MEM]", - "[RAM]", - "[DRIVE]", - "[DISK]", - "[DISPL]", - "[MOUSE]", - "[HW]", - "[KBD]" - }; - if (!(g_log_types & type)) - return; - if (level > g_log_level) - return; - if (g_log_newline) { - // last line had a \n - print type name - for (int i = 0; i < sizeof(type_name)/sizeof(type_name[0]); i++) - if (type & (1 << i)) - device->logerror("%-7s ", type_name[i]); - } - va_list ap; - va_start(ap, format); - device->vlogerror(format, ap); - va_end(ap); - g_log_newline = format[strlen(format) - 1] == '\n'; -} +int alto2_log_t::log_types = LOG_DISK | LOG_ETH; +int alto2_log_t::log_level = 8; +bool alto2_log_t::log_newline = true; +const char *const alto2_log_t::type_name[] = { + "[CPU]", + "[EMU]", + "[T01]", + "[T02]", + "[T03]", + "[KSEC]", + "[T05]", + "[T06]", + "[ETH]", + "[MRT]", + "[DWT]", + "[CURT]", + "[DHT]", + "[DVT]", + "[PART]", + "[KWD]", + "[T17]", + "[MEM]", + "[RAM]", + "[DRIVE]", + "[DISK]", + "[DISPL]", + "[MOUSE]", + "[HW]", + "[KBD]" +}; +const size_t alto2_log_t::type_name_count = sizeof(alto2_log_t::type_name) / sizeof(alto2_log_t::type_name[0]); +alto2_log_t logprintf; #endif //************************************************************************** -- cgit v1.2.3-70-g09d2