From a1cbca9f6eedc1239aae0331b8ddc33da628c05f Mon Sep 17 00:00:00 2001 From: hissorii Date: Wed, 9 Jul 2014 17:29:07 +0900 Subject: [PATCH] display real version at UI --- Makefile | 4 ++++ Makefile.psp | 6 ++--- develop.txt | 8 +++---- kaiseki.txt | 23 +++++++++++++++++++ px68k-android/jni/src/Android.mk | 3 ++- px68k-ios/mk_deb_pkg.sh | 4 +++- px68k-ios/px68k-ios.xcodeproj/project.pbxproj | 10 ++++++-- readme.txt | 3 ++- version.txt | 1 + x11/menu_str_sjis.txt | 4 ++-- x11/windraw.c | 7 ++++-- x11/winx68k.cpp | 2 +- x11/winx68k.h | 4 ++++ 13 files changed, 62 insertions(+), 17 deletions(-) create mode 100644 version.txt diff --git a/Makefile b/Makefile index 81894f6..64e7115 100644 --- a/Makefile +++ b/Makefile @@ -1,3 +1,5 @@ +include version.txt + CC = gcc CXX = c++ CXXLINK = $(CXX) @@ -51,6 +53,8 @@ CDEBUGFLAGS+= -DNO_MERCURY # CDEBUGFLAGS+= -DINLINE= # CDEBUGFLAGS+= -DUSE_GAS +CDEBUGFLAGS+=-DPX68K_VERSION=$(PX68K_VERSION) + ifdef SDL2 # SDL 2.0 SDL_CONFIG?= sdl2-config diff --git a/Makefile.psp b/Makefile.psp index dbef6c8..7c7d9f8 100644 --- a/Makefile.psp +++ b/Makefile.psp @@ -1,4 +1,4 @@ -VERSION=0.10 +include version.txt #if defined(NO_SOUND) EXTRA_DEFINES+= -DNOSOUND @@ -61,7 +61,7 @@ SDL_INCLUDE= `$(SDL_CONFIG) --cflags` SDL_LIB= `$(SDL_CONFIG) --libs` INCDIR = ./x11 ./x68k ./fmgen ./win32api -CFLAGS = -G0 -O2 -Wall $(SDL_INCLUDE) +CFLAGS = -G0 -O2 -Wall $(SDL_INCLUDE) -DPX68K_VERSION=$(PX68K_VERSION) # for debugging #CFLAGS = -g -G0 -Wall $(SDL_INCLUDE) CXXFLAGS = $(CFLAGS) -fno-exceptions -fno-rtti @@ -71,7 +71,7 @@ LDFLAGS = LIBS= -lpspgum -lpspgu -lm -lstdc++ $(SDL_LIB) EXTRA_TARGETS = EBOOT.PBP -PSP_EBOOT_TITLE = PX68K for PSP ver.$(VERSION) +PSP_EBOOT_TITLE = PX68K for PSP ver.$(PX68K_VERSION) PSP_EBOOT_ICON = psp_logo.png PSPSDK=$(shell psp-config --pspsdk-path) diff --git a/develop.txt b/develop.txt index ee59077..1345c84 100644 --- a/develop.txt +++ b/develop.txt @@ -2,7 +2,7 @@ PX68K ( Portable (x)keropi PRO-68K ) ソースを自分でコンパイルする際に役に立つかもしれないドキュメント - 2014/04/01 ひっそりぃ + 2014/07/04 ひっそりぃ ■開発環境について @@ -28,9 +28,9 @@ PX68K ( Portable (x)keropi PRO-68K ) ・Mac OS X - Mac OS X 10.9.2 - SDL2-2.0.1 - SDL2_gfx-1.0.0 + Mac OS X 10.9.3 + SDL2-2.0.3 + SDL2_gfx-1.0.1 Xcode 5.0.2 (GUIは使わずMakefileを用いてコマンドからmake) diff --git a/kaiseki.txt b/kaiseki.txt index 9a3b347..25ab21d 100644 --- a/kaiseki.txt +++ b/kaiseki.txt @@ -509,3 +509,26 @@ Software Keyboard は PSP または OpenGL ES 1.1 専用 Page0の(0, 0)を下位4ビットに, Page1の(0, 0)を上位4ビットに, Page0の(1, 0)を下位4ビットに, Page1の(1, 0)を上位4ビットに, +** 2014/07/04 + +* 一度解析したはずだが、すっかり忘れているのでもう一度 + +#define C68K_FETCH_BITS 8 // [4-12] default = 8 +#define C68K_ADR_BITS 24 +#define C68K_FETCH_SFT (C68K_ADR_BITS - C68K_FETCH_BITS) -> 16 +#define C68K_FETCH_BANK (1 << C68K_FETCH_BITS) -> 256 +#define C68K_FETCH_MASK (C68K_FETCH_BANK - 1) -> 255 = 0xff + +CPU->Fetch[256] + +C68k_Set_Fetch(&C68K, 0xc00000, 0xc7ffff, (UINT32)GVRAM); + +i = 0xc0, j = 0xc7 +fetch_adr = fetch_adr - (0xc0 << 16) = 0x12345678 - 0xc00000 +CPU->Fetch[0xc0] = fetch_adr +CPU->Fetch[0xc1] = fetch_adr + : : +CPU->Ftech[0xc7] = fetch_adr + +仮想MPUが0xc12345にアクセスする場合は、 +CPU->Fetch[0xc1] + 0xc12345 がホストCPUのアドレスになる diff --git a/px68k-android/jni/src/Android.mk b/px68k-android/jni/src/Android.mk index d591763..b91556b 100644 --- a/px68k-android/jni/src/Android.mk +++ b/px68k-android/jni/src/Android.mk @@ -1,5 +1,6 @@ LOCAL_PATH := $(call my-dir) +include ../../../version.txt include $(CLEAR_VARS) LOCAL_MODULE := main @@ -80,7 +81,7 @@ LOCAL_SRC_FILES := $(SDL_PATH)/src/main/android/SDL_android_main.c $(PX68KSRCS) LOCAL_SHARED_LIBRARIES := SDL2 -LOCAL_CFLAGS += -DUSE_OGLES11 +LOCAL_CFLAGS += -DUSE_OGLES11 -DPX68K_VERSION=$(PX68K_VERSION) LOCAL_LDLIBS := -lGLESv1_CM -llog diff --git a/px68k-ios/mk_deb_pkg.sh b/px68k-ios/mk_deb_pkg.sh index aaec098..3ac6053 100644 --- a/px68k-ios/mk_deb_pkg.sh +++ b/px68k-ios/mk_deb_pkg.sh @@ -34,6 +34,8 @@ cd px68k-ios mkdir DEBIAN +VER=`cat ~/src/px68k/version.txt | sed '/PX68K_VERSION=//'` + # make DEBIAN/control file cat < DEBIAN/control Name: px68k @@ -41,7 +43,7 @@ Package: com.fc2.blog45.hissorii.px68k Author: hissorii Maintainer: hissorii Section: Games -Version: 0.05 +Version: ${VER} Architecture: iphoneos-arm Description: Portable X68000 Emulator Depiction: http://hissorii.blog45.fc2.com diff --git a/px68k-ios/px68k-ios.xcodeproj/project.pbxproj b/px68k-ios/px68k-ios.xcodeproj/project.pbxproj index a790046..67ef372 100644 --- a/px68k-ios/px68k-ios.xcodeproj/project.pbxproj +++ b/px68k-ios/px68k-ios.xcodeproj/project.pbxproj @@ -784,7 +784,10 @@ INFOPLIST_FILE = "px68k-ios/px68k-ios-Info.plist"; IPHONEOS_DEPLOYMENT_TARGET = 6.1; LIBRARY_SEARCH_PATHS = libsdl/debug; - OTHER_CFLAGS = "-DUSE_OGLES11"; + OTHER_CFLAGS = ( + "-DUSE_OGLES11", + "-DPX68K_VERSION=0.15", + ); OTHER_LDFLAGS = "-lSDL2"; PRODUCT_NAME = "$(TARGET_NAME)"; WRAPPER_EXTENSION = app; @@ -808,7 +811,10 @@ INFOPLIST_FILE = "px68k-ios/px68k-ios-Info.plist"; IPHONEOS_DEPLOYMENT_TARGET = 6.1; LIBRARY_SEARCH_PATHS = libsdl/release; - OTHER_CFLAGS = "-DUSE_OGLES11"; + OTHER_CFLAGS = ( + "-DUSE_OGLES11", + "-DPX68K_VERSION=0.15", + ); OTHER_LDFLAGS = "-lSDL2"; PRODUCT_NAME = "$(TARGET_NAME)"; WRAPPER_EXTENSION = app; diff --git a/readme.txt b/readme.txt index 6cd2040..742f10e 100644 --- a/readme.txt +++ b/readme.txt @@ -1,6 +1,6 @@ ポータブルX68000エミュレータ PX68K ( Portable (x)keropi PRO-68K ) - 2014/07/03 + 2014/07/09 いろいろなデバイスで X68000 エミュレータが動作したら楽しいな、 と思い立ち、この PX68K を作りはじめました。 @@ -607,6 +607,7 @@ PX68K は以下の成分からできています。 2014/07/03 UI の FDD/HDD 番号を 0 origin に変更 2014/07/03 2 台目の HDD イメージに対応 2014/07/03 サウンドの出力周波数を UI で変更できるようにした + 2014/07/09 PX68K のバージョンを UI に表示するようにした 9. 免責 diff --git a/version.txt b/version.txt new file mode 100644 index 0000000..1a84c74 --- /dev/null +++ b/version.txt @@ -0,0 +1 @@ +PX68K_VERSION=0.15 diff --git a/x11/menu_str_sjis.txt b/x11/menu_str_sjis.txt index b05efce..b91b598 100644 --- a/x11/menu_str_sjis.txt +++ b/x11/menu_str_sjis.txt @@ -2,9 +2,9 @@ char twaku_str[] = " char twaku2_str[] = " "; char twaku3_str[] = ""; -char title_str[] = "rvhsbg owUWj Version 0.03"; +char title_str[] = "rvhsbg owUWj Version "; -char pc98_title1_str[] = "rvhsbgR}h Ver. 0.03"; +char pc98_title1_str[] = "rvhsbgR}h Ver. "; char pc98_title2_str[] = " Copyright (C) hissorii 2013"; char pc98_title3_str[] = " (݂̐ݒl)"; diff --git a/x11/windraw.c b/x11/windraw.c index ebff52d..65be05d 100644 --- a/x11/windraw.c +++ b/x11/windraw.c @@ -1788,6 +1788,7 @@ static void ogles11_draw_menu(void) void WinDraw_DrawMenu(int menu_state, int mkey_pos, int mkey_y, int *mval_y) { int i, drv; + char tmp[256]; // եȥܡset_sbp(kbd_buffer)ƤΤ᤹ #if defined(PSP) || defined(USE_OGLES11) @@ -1810,11 +1811,13 @@ void WinDraw_DrawMenu(int menu_state, int mkey_pos, int mkey_y, int *mval_y) set_mcolor(0xffff); set_mlocateC(1, 1); - draw_str(title_str); + sprintf(tmp, "%s%s", title_str, PX68KVERSTR); + draw_str(tmp); } else { set_mcolor(0xffff); set_mlocateC(0, 0); - draw_str(pc98_title1_str); + sprintf(tmp, "%s%s", pc98_title1_str, PX68KVERSTR); + draw_str(tmp); set_mlocateC(0, 2); draw_str(pc98_title3_str); set_mcolor(0x07ff); diff --git a/x11/winx68k.cpp b/x11/winx68k.cpp index cce11a9..c7f96c8 100644 --- a/x11/winx68k.cpp +++ b/x11/winx68k.cpp @@ -594,7 +594,7 @@ int main(int argc, char *argv[]) sceCtrlSetSamplingMode(PSP_CTRL_MODE_ANALOG); #endif - p6logd("20131205 %d %s\n", 123, "hoge"); + p6logd("PX68K Ver.%s\n", PX68KVERSTR); #ifdef RFMDRV struct sockaddr_in dest; diff --git a/x11/winx68k.h b/x11/winx68k.h index 5dbdd29..f9adc49 100644 --- a/x11/winx68k.h +++ b/x11/winx68k.h @@ -21,6 +21,10 @@ extern int rfd_sock; #define FULLSCREEN_POSX ((FULLSCREEN_WIDTH - SCREEN_WIDTH) / 2) #define FULLSCREEN_POSY ((FULLSCREEN_HEIGHT - SCREEN_HEIGHT) / 2) +#define TOSTR(s) #s +#define _TOSTR(s) TOSTR(s) +#define PX68KVERSTR _TOSTR(PX68K_VERSION) + extern BYTE* FONT; extern WORD VLINE_TOTAL;