Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-04-23 00:39:36 +03:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge tag 'mame0193'

Browse Source 
MAME 0.193

Conflicts:
	src/devices/cpu/arm7/arm7thmb.cpp
This commit is contained in:
Vas Crabb 2017-12-27 22:51:11 +11:00
commit e6635b97b5
5 changed files with 23 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
android-project/app/src/main/AndroidManifest.xml
View File

@ -4,8 +4,8 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="org.mamedev.mame"
android:versionCode="192"
android:versionName="0.192"
android:versionCode="193"
android:versionName="0.193"
android:installLocation="auto">
<!-- Android 5.0 -->

2
hash/ibm5170_cdrom.xml
View File

@ -164,7 +164,7 @@
<!-- Windows 95/98/ME -->
<!-- TODO: some transparency issues -->
<software name="dobupanic" supported="partial">
<description>Doka Chan No Building Panic (Japan)</description>
<description>Doka-chan no Building Panic (Japan)</description>
<year>2001</year>
<publisher>MSD-JAPAN / Salva Corporation / D-YAMA</publisher>
<info name="alt_title" value="どかちゃんのビルパニック" />

4
makefile
View File

@ -1547,14 +1547,14 @@ endif
ifeq (posix,$(SHELLTYPE))
$(GENDIR)/version.cpp: $(GENDIR)/git_desc | $(GEN_FOLDERS)
@echo '#define BARE_BUILD_VERSION "0.192"' > $@
@echo '#define BARE_BUILD_VERSION "0.193"' > $@
@echo 'extern const char bare_build_version[];' >> $@
@echo 'extern const char build_version[];' >> $@
@echo 'const char bare_build_version[] = BARE_BUILD_VERSION;' >> $@
@echo 'const char build_version[] = BARE_BUILD_VERSION " ($(NEW_GIT_VERSION))";' >> $@
else
$(GENDIR)/version.cpp: $(GENDIR)/git_desc
@echo #define BARE_BUILD_VERSION "0.192" > $@
@echo #define BARE_BUILD_VERSION "0.193" > $@
@echo extern const char bare_build_version[]; >> $@
@echo extern const char build_version[]; >> $@
@echo const char bare_build_version[] = BARE_BUILD_VERSION; >> $@

31
src/devices/cpu/arm7/arm7thmb.cpp
View File

@ -977,7 +977,7 @@ void arm7_cpu_device::tg05_0(uint32_t pc, uint32_t op) /* STR Rd, [Rn, Rm] */
uint32_t rn = (op & THUMB_GROUP5_RN) >> THUMB_GROUP5_RN_SHIFT;
uint32_t rd = (op & THUMB_GROUP5_RD) >> THUMB_GROUP5_RD_SHIFT;
uint32_t addr = GetRegister(rn) + GetRegister(rm);
WRITE32(addr, GetRegister(rd));
WRITE32(addr & ~3, GetRegister(rd));
R15 += 2;
}
@ -987,7 +987,7 @@ void arm7_cpu_device::tg05_1(uint32_t pc, uint32_t op) /* STRH Rd, [Rn, Rm] */
uint32_t rn = (op & THUMB_GROUP5_RN) >> THUMB_GROUP5_RN_SHIFT;
uint32_t rd = (op & THUMB_GROUP5_RD) >> THUMB_GROUP5_RD_SHIFT;
uint32_t addr = GetRegister(rn) + GetRegister(rm);
WRITE16(addr, GetRegister(rd));
WRITE16(addr & ~1, GetRegister(rd));
R15 += 2;
}
@ -1022,8 +1022,9 @@ void arm7_cpu_device::tg05_4(uint32_t pc, uint32_t op) /* LDR Rd, [Rn, Rm] */
uint32_t rn = (op & THUMB_GROUP5_RN) >> THUMB_GROUP5_RN_SHIFT;
uint32_t rd = (op & THUMB_GROUP5_RD) >> THUMB_GROUP5_RD_SHIFT;
uint32_t addr = GetRegister(rn) + GetRegister(rm);
uint32_t op2 = READ32(addr);
SetRegister(rd, op2);
uint32_t tmp = READ32(addr & ~3);
addr = (addr & 3) << 3;
SetRegister(rd, ROR(tmp, addr));
R15 += 2;
}
@ -1033,7 +1034,7 @@ void arm7_cpu_device::tg05_5(uint32_t pc, uint32_t op) /* LDRH Rd, [Rn, Rm] */
uint32_t rn = (op & THUMB_GROUP5_RN) >> THUMB_GROUP5_RN_SHIFT;
uint32_t rd = (op & THUMB_GROUP5_RD) >> THUMB_GROUP5_RD_SHIFT;
uint32_t addr = GetRegister(rn) + GetRegister(rm);
uint32_t op2 = READ16(addr);
uint32_t op2 = READ16(addr & ~1);
SetRegister(rd, op2);
R15 += 2;
}
@ -1069,7 +1070,7 @@ void arm7_cpu_device::tg06_0(uint32_t pc, uint32_t op) /* Store */
uint32_t rn = (op & THUMB_ADDSUB_RS) >> THUMB_ADDSUB_RS_SHIFT;
uint32_t rd = op & THUMB_ADDSUB_RD;
int32_t offs = ((op & THUMB_LSOP_OFFS) >> THUMB_LSOP_OFFS_SHIFT) << 2;
WRITE32(GetRegister(rn) + offs, GetRegister(rd));
WRITE32((GetRegister(rn) + offs) & ~3, GetRegister(rd));
R15 += 2;
}
@ -1077,8 +1078,10 @@ void arm7_cpu_device::tg06_1(uint32_t pc, uint32_t op) /* Load */
{
uint32_t rn = (op & THUMB_ADDSUB_RS) >> THUMB_ADDSUB_RS_SHIFT;
uint32_t rd = op & THUMB_ADDSUB_RD;
int32_t offs = ((op & THUMB_LSOP_OFFS) >> THUMB_LSOP_OFFS_SHIFT) << 2;
SetRegister(rd, READ32(GetRegister(rn) + offs)); // fix
uint32_t addr = GetRegister(rn) + (((op & THUMB_LSOP_OFFS) >> THUMB_LSOP_OFFS_SHIFT) << 2);
uint32_t tmp = READ32(addr & ~3);
addr = (addr & 3) << 3;
SetRegister(rd, ROR(tmp, addr));
R15 += 2;
}
@ -1109,7 +1112,7 @@ void arm7_cpu_device::tg08_0(uint32_t pc, uint32_t op) /* Store */
uint32_t imm = (op & THUMB_HALFOP_OFFS) >> THUMB_HALFOP_OFFS_SHIFT;
uint32_t rs = (op & THUMB_ADDSUB_RS) >> THUMB_ADDSUB_RS_SHIFT;
uint32_t rd = (op & THUMB_ADDSUB_RD) >> THUMB_ADDSUB_RD_SHIFT;
WRITE16(GetRegister(rs) + (imm << 1), GetRegister(rd));
WRITE16((GetRegister(rs) + (imm << 1)) & ~1, GetRegister(rd));
R15 += 2;
}
@ -1118,7 +1121,7 @@ void arm7_cpu_device::tg08_1(uint32_t pc, uint32_t op) /* Load */
uint32_t imm = (op & THUMB_HALFOP_OFFS) >> THUMB_HALFOP_OFFS_SHIFT;
uint32_t rs = (op & THUMB_ADDSUB_RS) >> THUMB_ADDSUB_RS_SHIFT;
uint32_t rd = (op & THUMB_ADDSUB_RD) >> THUMB_ADDSUB_RD_SHIFT;
SetRegister(rd, READ16(GetRegister(rs) + (imm << 1)));
SetRegister(rd, READ16((GetRegister(rs) + (imm << 1)) & ~1));
R15 += 2;
}
@ -1128,7 +1131,7 @@ void arm7_cpu_device::tg09_0(uint32_t pc, uint32_t op) /* Store */
{
uint32_t rd = (op & THUMB_STACKOP_RD) >> THUMB_STACKOP_RD_SHIFT;
int32_t offs = (uint8_t)(op & THUMB_INSN_IMM);
WRITE32(GetRegister(13) + ((uint32_t)offs << 2), GetRegister(rd));
WRITE32((GetRegister(13) + ((uint32_t)offs << 2)) & ~3, GetRegister(rd));
R15 += 2;
}
@ -1191,7 +1194,7 @@ void arm7_cpu_device::tg0b_4(uint32_t pc, uint32_t op) /* PUSH {Rlist} */
if (op & (1 << offs))
{
SetRegister(13, GetRegister(13) - 4);
WRITE32(GetRegister(13), GetRegister(offs));
WRITE32(GetRegister(13) & ~3, GetRegister(offs));
}
}
R15 += 2;
@ -1200,13 +1203,13 @@ void arm7_cpu_device::tg0b_4(uint32_t pc, uint32_t op) /* PUSH {Rlist} */
void arm7_cpu_device::tg0b_5(uint32_t pc, uint32_t op) /* PUSH {Rlist}{LR} */
{
SetRegister(13, GetRegister(13) - 4);
WRITE32(GetRegister(13), GetRegister(14));
WRITE32(GetRegister(13) & ~3, GetRegister(14));
for (int32_t offs = 7; offs >= 0; offs--)
{
if (op & (1 << offs))
{
SetRegister(13, GetRegister(13) - 4);
WRITE32(GetRegister(13), GetRegister(offs));
WRITE32(GetRegister(13) & ~3, GetRegister(offs));
}
}
R15 += 2;

2
src/mame/drivers/hp2640.cpp
View File

@ -358,7 +358,7 @@ void hp2645_state::video_fill_buffer(bool buff_idx , unsigned max_cycles)
bool curr_iv = false; // U310-5
uint8_t curr_attrs = 0;
bool link_lsb = false;
uint8_t dma_byte;
uint8_t dma_byte = 0;
for (unsigned i = 0 , mem_cycles = 0; i < VIDEO_VIS_COLS && mem_cycles < max_cycles; mem_cycles++) {
if (link_lsb) {