summaryrefslogtreecommitdiffstatshomepage
path: root/src/emu/cpu
diff options
context:
space:
mode:
Diffstat (limited to 'src/emu/cpu')
-rw-r--r--src/emu/cpu/cop400/cop400.h3
-rw-r--r--src/emu/cpu/i8085/i8085.c2
-rw-r--r--src/emu/cpu/i8085/i8085.h3
-rw-r--r--src/emu/cpu/i8085/i8085cpu.h180
-rw-r--r--src/emu/cpu/m6809/konami.c2
-rw-r--r--src/emu/cpu/tms34010/34010dsm.c2
-rw-r--r--src/emu/cpu/tms34010/dis34010.c2
-rw-r--r--src/emu/cpu/z8/z8.c3
-rw-r--r--src/emu/cpu/z8/z8.h3
-rw-r--r--src/emu/cpu/z8/z8ops.inc3
10 files changed, 95 insertions, 108 deletions
diff --git a/src/emu/cpu/cop400/cop400.h b/src/emu/cpu/cop400/cop400.h
index 99c76f81c48..aba03516d39 100644
--- a/src/emu/cpu/cop400/cop400.h
+++ b/src/emu/cpu/cop400/cop400.h
@@ -6,9 +6,6 @@
National Semiconductor COPS Emulator.
- Copyright Nicola Salmoria and the MAME Team.
- Visit http://mamedev.org for licensing and usage restrictions.
-
***************************************************************************/
#pragma once
diff --git a/src/emu/cpu/i8085/i8085.c b/src/emu/cpu/i8085/i8085.c
index f510afc5dd9..904c4d3771d 100644
--- a/src/emu/cpu/i8085/i8085.c
+++ b/src/emu/cpu/i8085/i8085.c
@@ -1,5 +1,5 @@
// license:BSD-3-Clause
-// copyright-holders:Juergen Buchmueller
+// copyright-holders:Juergen Buchmueller, hap
/*****************************************************************************
*
* i8085.c
diff --git a/src/emu/cpu/i8085/i8085.h b/src/emu/cpu/i8085/i8085.h
index 8ce29d7bd12..a0e8f5d8d3a 100644
--- a/src/emu/cpu/i8085/i8085.h
+++ b/src/emu/cpu/i8085/i8085.h
@@ -1,5 +1,6 @@
// license:BSD-3-Clause
-// copyright-holders:Juergen Buchmueller
+// copyright-holders:Juergen Buchmueller, hap
+
#ifndef __I8085_H__
#define __I8085_H__
diff --git a/src/emu/cpu/i8085/i8085cpu.h b/src/emu/cpu/i8085/i8085cpu.h
index 17bfecfdd59..5ccecf3cd95 100644
--- a/src/emu/cpu/i8085/i8085cpu.h
+++ b/src/emu/cpu/i8085/i8085cpu.h
@@ -1,5 +1,5 @@
// license:BSD-3-Clause
-// copyright-holders:Juergen Buchmueller
+// copyright-holders:Juergen Buchmueller, hap
/*******************************************************
*
* Portable (hopefully ;-) 8085A emulator
@@ -41,26 +41,26 @@
#define M_MVI(R) R=ARG()
/* rotate */
-#define M_RLC { \
- m_AF.b.h = (m_AF.b.h << 1) | (m_AF.b.h >> 7); \
- m_AF.b.l = (m_AF.b.l & 0xfe) | (m_AF.b.h & CF); \
+#define M_RLC { \
+ m_AF.b.h = (m_AF.b.h << 1) | (m_AF.b.h >> 7); \
+ m_AF.b.l = (m_AF.b.l & 0xfe) | (m_AF.b.h & CF); \
}
-#define M_RRC { \
- m_AF.b.l = (m_AF.b.l & 0xfe) | (m_AF.b.h & CF); \
- m_AF.b.h = (m_AF.b.h >> 1) | (m_AF.b.h << 7); \
+#define M_RRC { \
+ m_AF.b.l = (m_AF.b.l & 0xfe) | (m_AF.b.h & CF); \
+ m_AF.b.h = (m_AF.b.h >> 1) | (m_AF.b.h << 7); \
}
-#define M_RAL { \
- int c = m_AF.b.l&CF; \
- m_AF.b.l = (m_AF.b.l & 0xfe) | (m_AF.b.h >> 7); \
- m_AF.b.h = (m_AF.b.h << 1) | c; \
+#define M_RAL { \
+ int c = m_AF.b.l&CF; \
+ m_AF.b.l = (m_AF.b.l & 0xfe) | (m_AF.b.h >> 7); \
+ m_AF.b.h = (m_AF.b.h << 1) | c; \
}
-#define M_RAR { \
- int c = (m_AF.b.l&CF) << 7; \
- m_AF.b.l = (m_AF.b.l & 0xfe) | (m_AF.b.h & CF); \
- m_AF.b.h = (m_AF.b.h >> 1) | c; \
+#define M_RAR { \
+ int c = (m_AF.b.l&CF) << 7; \
+ m_AF.b.l = (m_AF.b.l & 0xfe) | (m_AF.b.h & CF); \
+ m_AF.b.h = (m_AF.b.h >> 1) | c; \
}
/* logical */
@@ -73,116 +73,116 @@
#define M_DCR(R) {UINT8 hc = ((R & 0x0f) != 0x00) ? HF : 0; --R; m_AF.b.l= (m_AF.b.l & CF ) | ZSP[R] | hc | VF; }
/* arithmetic */
-#define M_ADD(R) { \
- int q = m_AF.b.h+R; \
- m_AF.b.l=ZSP[q&255]|((q>>8)&CF)|((m_AF.b.h^q^R)&HF); \
- m_AF.b.h=q; \
+#define M_ADD(R) { \
+ int q = m_AF.b.h+R; \
+ m_AF.b.l=ZSP[q&255]|((q>>8)&CF)|((m_AF.b.h^q^R)&HF); \
+ m_AF.b.h=q; \
}
-#define M_ADC(R) { \
- int q = m_AF.b.h+R+(m_AF.b.l&CF); \
- m_AF.b.l=ZSP[q&255]|((q>>8)&CF)|((m_AF.b.h^q^R)&HF); \
- m_AF.b.h=q; \
+#define M_ADC(R) { \
+ int q = m_AF.b.h+R+(m_AF.b.l&CF); \
+ m_AF.b.l=ZSP[q&255]|((q>>8)&CF)|((m_AF.b.h^q^R)&HF); \
+ m_AF.b.h=q; \
}
-#define M_SUB(R) { \
- int q = m_AF.b.h-R; \
- m_AF.b.l=ZSP[q&255]|((q>>8)&CF)|(~(m_AF.b.h^q^R)&HF)|VF; \
- m_AF.b.h=q; \
+#define M_SUB(R) { \
+ int q = m_AF.b.h-R; \
+ m_AF.b.l=ZSP[q&255]|((q>>8)&CF)|(~(m_AF.b.h^q^R)&HF)|VF; \
+ m_AF.b.h=q; \
}
-#define M_SBB(R) { \
- int q = m_AF.b.h-R-(m_AF.b.l&CF); \
- m_AF.b.l=ZSP[q&255]|((q>>8)&CF)|(~(m_AF.b.h^q^R)&HF)|VF; \
- m_AF.b.h=q; \
+#define M_SBB(R) { \
+ int q = m_AF.b.h-R-(m_AF.b.l&CF); \
+ m_AF.b.l=ZSP[q&255]|((q>>8)&CF)|(~(m_AF.b.h^q^R)&HF)|VF; \
+ m_AF.b.h=q; \
}
-#define M_CMP(R) { \
- int q = m_AF.b.h-R; \
- m_AF.b.l=ZSP[q&255]|((q>>8)&CF)|(~(m_AF.b.h^q^R)&HF)|VF; \
+#define M_CMP(R) { \
+ int q = m_AF.b.h-R; \
+ m_AF.b.l=ZSP[q&255]|((q>>8)&CF)|(~(m_AF.b.h^q^R)&HF)|VF; \
}
-#define M_DAD(R) { \
- int q = m_HL.d + m_##R.d; \
- m_AF.b.l = (m_AF.b.l & ~CF) | (q>>16 & CF ); \
- m_HL.w.l = q; \
+#define M_DAD(R) { \
+ int q = m_HL.d + m_##R.d; \
+ m_AF.b.l = (m_AF.b.l & ~CF) | (q>>16 & CF ); \
+ m_HL.w.l = q; \
}
// DSUB is 8085-only, not sure if H flag handling is correct
-#define M_DSUB() { \
- int q = m_HL.b.l-m_BC.b.l; \
- m_AF.b.l=ZS[q&255]|((q>>8)&CF)|VF| \
- ((m_HL.b.l^q^m_BC.b.l)&HF)| \
- (((m_BC.b.l^m_HL.b.l)&(m_HL.b.l^q)&SF)>>5); \
- m_HL.b.l=q; \
- q = m_HL.b.h-m_BC.b.h-(m_AF.b.l&CF); \
- m_AF.b.l=ZS[q&255]|((q>>8)&CF)|VF| \
- ((m_HL.b.h^q^m_BC.b.h)&HF)| \
- (((m_BC.b.h^m_HL.b.h)&(m_HL.b.h^q)&SF)>>5); \
- if (m_HL.b.l!=0) m_AF.b.l&=~ZF; \
+#define M_DSUB() { \
+ int q = m_HL.b.l-m_BC.b.l; \
+ m_AF.b.l=ZS[q&255]|((q>>8)&CF)|VF| \
+ ((m_HL.b.l^q^m_BC.b.l)&HF)| \
+ (((m_BC.b.l^m_HL.b.l)&(m_HL.b.l^q)&SF)>>5); \
+ m_HL.b.l=q; \
+ q = m_HL.b.h-m_BC.b.h-(m_AF.b.l&CF); \
+ m_AF.b.l=ZS[q&255]|((q>>8)&CF)|VF| \
+ ((m_HL.b.h^q^m_BC.b.h)&HF)| \
+ (((m_BC.b.h^m_HL.b.h)&(m_HL.b.h^q)&SF)>>5); \
+ if (m_HL.b.l!=0) m_AF.b.l&=~ZF; \
}
/* i/o */
-#define M_IN \
- m_STATUS = 0x42; \
- m_WZ.d=ARG(); \
+#define M_IN \
+ m_STATUS = 0x42; \
+ m_WZ.d=ARG(); \
m_AF.b.h=m_io->read_byte(m_WZ.d);
-#define M_OUT \
- m_STATUS = 0x10; \
- m_WZ.d=ARG(); \
+#define M_OUT \
+ m_STATUS = 0x10; \
+ m_WZ.d=ARG(); \
m_io->write_byte(m_WZ.d,m_AF.b.h)
/* stack */
-#define M_PUSH(R) { \
- m_STATUS = 0x04; \
+#define M_PUSH(R) { \
+ m_STATUS = 0x04; \
m_program->write_byte(--m_SP.w.l, m_##R.b.h); \
m_program->write_byte(--m_SP.w.l, m_##R.b.l); \
}
-#define M_POP(R) { \
- m_STATUS = 0x86; \
+#define M_POP(R) { \
+ m_STATUS = 0x86; \
m_##R.b.l = m_program->read_byte(m_SP.w.l++); \
m_##R.b.h = m_program->read_byte(m_SP.w.l++); \
}
/* jumps */
// On 8085 jump if condition is not satisfied is shorter
-#define M_JMP(cc) { \
- if (cc) { \
- m_PC.w.l = ARG16(); \
- } else { \
- m_PC.w.l += 2; \
- m_icount += (IS_8085()) ? 3 : 0; \
- } \
+#define M_JMP(cc) { \
+ if (cc) { \
+ m_PC.w.l = ARG16(); \
+ } else { \
+ m_PC.w.l += 2; \
+ m_icount += (IS_8085()) ? 3 : 0; \
+ } \
}
// On 8085 call if condition is not satisfied is 9 ticks
-#define M_CALL(cc) \
-{ \
- if (cc) \
- { \
- UINT16 a = ARG16(); \
- m_icount -= (IS_8085()) ? 7 : 6 ; \
- M_PUSH(PC); \
- m_PC.d = a; \
- } else { \
- m_PC.w.l += 2; \
- m_icount += (IS_8085()) ? 2 : 0; \
- } \
+#define M_CALL(cc) \
+{ \
+ if (cc) \
+ { \
+ UINT16 a = ARG16(); \
+ m_icount -= (IS_8085()) ? 7 : 6 ; \
+ M_PUSH(PC); \
+ m_PC.d = a; \
+ } else { \
+ m_PC.w.l += 2; \
+ m_icount += (IS_8085()) ? 2 : 0; \
+ } \
}
// conditional RET only
-#define M_RET(cc) \
-{ \
- if (cc) \
- { \
- m_icount -= 6; \
- M_POP(PC); \
- } \
-}
-
-#define M_RST(nn) { \
- M_PUSH(PC); \
- m_PC.d = 8 * nn; \
+#define M_RET(cc) \
+{ \
+ if (cc) \
+ { \
+ m_icount -= 6; \
+ M_POP(PC); \
+ } \
+}
+
+#define M_RST(nn) { \
+ M_PUSH(PC); \
+ m_PC.d = 8 * nn; \
}
diff --git a/src/emu/cpu/m6809/konami.c b/src/emu/cpu/m6809/konami.c
index 16895a79e31..d86f44651d2 100644
--- a/src/emu/cpu/m6809/konami.c
+++ b/src/emu/cpu/m6809/konami.c
@@ -6,8 +6,6 @@
Portable Konami cpu emulator
- Copyright Nicola Salmoria and the MAME Team
-
Based on M6809 cpu core copyright John Butler
References:
diff --git a/src/emu/cpu/tms34010/34010dsm.c b/src/emu/cpu/tms34010/34010dsm.c
index 2fc3168cc45..15136885da4 100644
--- a/src/emu/cpu/tms34010/34010dsm.c
+++ b/src/emu/cpu/tms34010/34010dsm.c
@@ -1,4 +1,4 @@
-// license:???
+// license:BSD-3-Clause
// copyright-holders:Zsolt Vasvari
/*
* A TMS34010 disassembler
diff --git a/src/emu/cpu/tms34010/dis34010.c b/src/emu/cpu/tms34010/dis34010.c
index a17d9e14816..19e3338a7d2 100644
--- a/src/emu/cpu/tms34010/dis34010.c
+++ b/src/emu/cpu/tms34010/dis34010.c
@@ -1,4 +1,4 @@
-// license:???
+// license:BSD-3-Clause
// copyright-holders:Zsolt Vasvari
/* This program is based on DIS68k by Aaron Giles */
diff --git a/src/emu/cpu/z8/z8.c b/src/emu/cpu/z8/z8.c
index 97488f7381b..bcff4b44145 100644
--- a/src/emu/cpu/z8/z8.c
+++ b/src/emu/cpu/z8/z8.c
@@ -4,9 +4,6 @@
Zilog Z8 Single-Chip MCU emulation
- Copyright MESS Team.
- Visit http://mamedev.org for licensing and usage restrictions.
-
**********************************************************************/
/*
diff --git a/src/emu/cpu/z8/z8.h b/src/emu/cpu/z8/z8.h
index c1061fcccdb..79c64c268b2 100644
--- a/src/emu/cpu/z8/z8.h
+++ b/src/emu/cpu/z8/z8.h
@@ -4,9 +4,6 @@
Zilog Z8 Single-Chip MCU emulation
- Copyright MESS Team.
- Visit http://mamedev.org for licensing and usage restrictions.
-
**********************************************************************/
#pragma once
diff --git a/src/emu/cpu/z8/z8ops.inc b/src/emu/cpu/z8/z8ops.inc
index 2249ddfdd7d..79621ed1512 100644
--- a/src/emu/cpu/z8/z8ops.inc
+++ b/src/emu/cpu/z8/z8ops.inc
@@ -4,9 +4,6 @@
Zilog Z8 Single-Chip MCU emulation
- Copyright MESS Team.
- Visit http://mamedev.org for licensing and usage restrictions.
-
**********************************************************************/
/***************************************************************************