From 64922100a23e4e58b9da4bf2b88524b001e5bdf5 Mon Sep 17 00:00:00 2001 From: "Javier S. Pedro" Date: Wed, 19 Aug 2009 15:49:43 +0200 Subject: [PATCH] minor fixes to help with asm debugging --- Makefile | 4 ++-- debian/changelog | 3 ++- m3d_func.s | 2 +- misc.s | 2 +- os9x_65c816.s | 17 +++++++---------- spc700a.s | 3 ++- 6 files changed, 15 insertions(+), 16 deletions(-) diff --git a/Makefile b/Makefile index 85c5c24..18621f4 100644 --- a/Makefile +++ b/Makefile @@ -4,8 +4,8 @@ CPPFLAGS := -I. $(shell sdl-config --cflags) $(shell pkg-config --cflags x11 xsp LDLIBS := -lz $(shell sdl-config --libs) $(shell pkg-config --libs x11 xsp) -lpopt -lhgw # Default CFLAGS for building in N8x0 -CFLAGS ?= -march=armv6j -mtune=arm1136jf-s -mfpu=vfp -mfloat-abi=softfp -Os -g -Wall -static-libgcc -ASFLAGS ?= -march=armv6j -mfpu=vfp -mfloat-abi=softfp +CFLAGS ?= -march=armv6j -mtune=arm1136jf-s -mfpu=vfp -mfloat-abi=softfp -Os -g -Wall -static-libgcc -fno-omit-frame-pointer +ASFLAGS ?= -march=armv6j -mfpu=vfp -mfloat-abi=softfp -g CXXFLAGS ?= $(CFLAGS) GAME_VERSION ?= 0.9.4 diff --git a/debian/changelog b/debian/changelog index 50f1b8a..061a5aa 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,8 +7,9 @@ drnoksnes (0.9.4) unstable; urgency=low * A lot of emu options now available in GUI. * Emu now installs a symlink in /usr/bin so it can be easily launched. * Slightly fixed icon and graphics. + * Distributing config file. - -- Javier S. Pedro Tue, 18 Aug 2009 23:47:28 +0200 + -- Javier S. Pedro Tue, 18 Aug 2009 23:48:53 +0200 drnoksnes (0.9.3) unstable; urgency=low diff --git a/m3d_func.s b/m3d_func.s index c30c191..779736c 100644 --- a/m3d_func.s +++ b/m3d_func.s @@ -1,4 +1,4 @@ - +.text .align 4 .globl funcSMULT1616 .globl funcUMULT1616 diff --git a/misc.s b/misc.s index 1ef2e58..7ddedfb 100644 --- a/misc.s +++ b/misc.s @@ -3,7 +3,7 @@ @ Generic memory routines. @ (c) Copyright 2007, Grazvydas "notaz" Ignotas - +.text .global memcpy16 @ unsigned short *dest, unsigned short *src, int count memcpy16: diff --git a/os9x_65c816.s b/os9x_65c816.s index 02e886e..766c5c8 100644 --- a/os9x_65c816.s +++ b/os9x_65c816.s @@ -142,13 +142,6 @@ reg_cpu_var .req R14 /*****************************************************************/ -.macro trace_asm val - push {r0-r5, r12, lr} - mov r0, #\val - bl print_asm_i - pop {r0-r5, r12, lr} -.endm - /* prepare */ .macro PREPARE_C_CALL STMFD R13!,{R12,R14} @@ -1153,6 +1146,10 @@ reg_cpu_var .req R14 MOVS rscratch,rscratch .endm +@ START OF PROGRAM CODE + +.text + .globl asmS9xGetByte .globl asmS9xGetWord .globl asmS9xSetByte @@ -4476,9 +4473,8 @@ void asm_S9xOpcode_NMI(void) /**************************************************************** GLOBAL ****************************************************************/ - .globl test_opcode - .globl asmMainLoop - +.global asmMainLoop +.type asmMainLoop, function @ void asmMainLoop(asm_cpu_var_t *asmcpuPtr); asmMainLoop: @@ -4571,6 +4567,7 @@ endmainLoop: LDMFD R13!,{R4-R11, LR} BX LR .pool +.size asmMainLoop, asmMainLoop-. @ void test_opcode(struct asm_cpu_var *asm_var); test_opcode: diff --git a/spc700a.s b/spc700a.s index 4d41743..7aafc3d 100644 --- a/spc700a.s +++ b/spc700a.s @@ -11,7 +11,7 @@ @ the code is released under Snes9x license. See spcgen.c or any other source file @ from Snes9x source tree. - +.text .extern IAPU .extern CPU @ for STOP and SLEEP .extern S9xAPUGetByte @@ -20,6 +20,7 @@ .extern S9xAPUSetByteZ .global spc700_execute @ int cycles + .type spc700_execute, function .global Spc700JumpTab opcode .req r3 -- 1.7.9.5