Apple-2-Tools/apple2ix
1
0
Fork 0
mirror of https://github.com/mauiaaron/apple2.git synced 2024-12-24 18:31:51 +00:00
Code Issues Projects Releases Wiki Activity

Misc build tweaks

Browse Source
This commit is contained in:
Aaron Culliney 2015-02-15 18:39:37 -08:00
parent 35458b2839
commit 6439d303a8
3 changed files with 16 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/cpu-supp.c
View File

@ -580,68 +580,50 @@ uint8_t cpu65__opcycles[256] = {
};
// NOTE: currently this is a conversion table between i386 flags <-> 6502 P register
static void initialize_code_tables()
{
for (unsigned i = 0; i < 256; i++)
{
static void init_flags_conversion_tables(void) {
for (unsigned i = 0; i < 256; i++) {
unsigned char val = 0;
if (i & C_Flag)
{
if (i & C_Flag) {
val |= C_Flag_6502;
}
if (i & X_Flag)
{
if (i & X_Flag) {
val |= X_Flag_6502;
}
if (i & I_Flag)
{
if (i & I_Flag) {
val |= I_Flag_6502;
}
if (i & V_Flag)
{
if (i & V_Flag) {
val |= V_Flag_6502;
}
if (i & B_Flag)
{
if (i & B_Flag) {
val |= B_Flag_6502;
}
if (i & D_Flag)
{
if (i & D_Flag) {
val |= D_Flag_6502;
}
if (i & Z_Flag)
{
if (i & Z_Flag) {
val |= Z_Flag_6502;
}
if (i & N_Flag)
{
if (i & N_Flag) {
val |= N_Flag_6502;
}
#if defined(__i386__) || defined(__x86_64__)
cpu65_flags_encode[ i ] = val/* | 0x20 WTF?*/;
cpu65_flags_encode[ i ] = val;
cpu65_flags_decode[ val ] = i;
#elif defined(__arm__)
# error TODO FIXME proper map of ARM processor flags
#elif defined(__aarch64__)
# error soon ...
#else
# error unknown machine architecture
#endif
}
}
void cpu65_init(void)
{
initialize_code_tables();
init_flags_conversion_tables();
cpu65__signal = 0;
cpu65_pc = 0x0;
cpu65_ea = 0x0;

1
src/cpu.h
View File

@ -97,6 +97,7 @@ void cpu65_trace_checkpoint(void);
# define Z_Flag 0x40 /* 6502 Zero */
# define N_Flag 0x80 /* 6502 Negative */
#elif defined(__arm__)
// VCZN positions match positions of shifted status register
# define V_Flag 0x1
# define C_Flag 0x2
# define Z_Flag 0x4

3
src/video_util/glUtil.h
View File

@ -26,6 +26,9 @@
#elif defined(USE_GL3W)
# include <GL3/gl3.h>
# include <GL3/gl3w.h>
#elif defined(ANDROID)
# include <GLES2/gl2.h>
# include <GLES2/gl2ext.h>
#else
# define GLEW_STATIC
# include <GL/glew.h>