Skip to content

Commit

Permalink
Removed wla-6510 (as wla-6502 can be used for 6510). Fixes Github issue
Browse files Browse the repository at this point in the history
  • Loading branch information
vhelin committed Mar 12, 2022
1 parent 8d8c3a5 commit 1006c3f
Show file tree
Hide file tree
Showing 72 changed files with 282 additions and 2,057 deletions.
9 changes: 5 additions & 4 deletions CHANGELOG
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@

---------------------------------------------------------------------------------------------------------
1... WLA GB-Z80/Z80/6502/65C02/65CE02/6510/65816/6800/6801/6809/8008/8080/HUC6280/SPC-700/SuperFX History
---------------------------------------------------------------------------------------------------------
----------------------------------------------------------------------------------------------------
1... WLA GB-Z80/Z80/6502/65C02/65CE02/65816/6800/6801/6809/8008/8080/HUC6280/SPC-700/SuperFX History
----------------------------------------------------------------------------------------------------

v10.2 (08-Mar-2022) [ALL] Added SIZE to .RAMSECTION.
v10.2 (12-Mar-2022) [ALL] Added SIZE to .RAMSECTION.
[ALL] .FOPEN should now work with makefile generation.
[ALL] WLA's summary is now printed to stdout instead of
stderr.
[ALL] Added support for UTF-8 source files (meaning labels,
macro names, definitions, etc. can all be UTF-8).
[ALL] Removed wla-6510 as wla-6502 can be used for 6510.
[650] Added undocumented opcodes to wla-6502.

v10.1 (19-Feb-2022) [ALL] Arguments to .SECTION and .RAMSECTION can be now
Expand Down
3 changes: 1 addition & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ set(ARCHS
"65c02:WDC65C02"
"65ce02:CSG65CE02"
"6502:MCS6502"
"6510:MCS6510"
"65816:W65816"
"huc6280:HUC6280"
"spc700:SPC700"
Expand Down Expand Up @@ -189,7 +188,7 @@ endif()

# Packaging via CPack
set(CPACK_PACKAGE_DESCRIPTION_SUMMARY
"Yet Another GB-Z80/Z80/6502/65C02/65CE02/6510/65816/6800/6801/6809/8008/8080/HUC6280/SPC-700/SuperFX Multi Platform Cross Assembler Package")
"Yet Another GB-Z80/Z80/6502/65C02/65CE02/65816/6800/6801/6809/8008/8080/HUC6280/SPC-700/SuperFX Multi Platform Cross Assembler Package")
set(CPACK_PACKAGE_CHECKSUM MD5) # CPack 3.7+
set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE")
set(CPACK_GENERATOR ZIP TGZ 7Z)
Expand Down
8 changes: 4 additions & 4 deletions FILE_FORMATS
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@ NOTE! integers are in big endian format.



WLA GB-Z80/Z80/6502/65C02/65CE02/6510/65816/6800/6801/6809/8008/8080/HuC6280/SPC-700/SuperFX object file format "WLAi"
WLA GB-Z80/Z80/6502/65C02/65CE02/65816/6800/6801/6809/8008/8080/HuC6280/SPC-700/SuperFX object file format "WLAi"


bytes description

header:

4 format information,
"WLAi" - WLA GB-Z80/Z80/6502/65C02/65CE02/6510/65816/6800/6801/6809/8008/8080/HuC6280/SPC-700/SuperFX object file version 34 (06-Feb-2022)
"WLAi" - WLA GB-Z80/Z80/6502/65C02/65CE02/65816/6800/6801/6809/8008/8080/HuC6280/SPC-700/SuperFX object file version 34 (06-Feb-2022)
1 empty fill
1 misc bits (bit 0 - sms checksum (1 == compute)
bit 1 - snes rom mode (0 == lorom, 1 == hirom)
Expand Down Expand Up @@ -186,15 +186,15 @@ section:



WLA-GB/Z80/6502/65C02/65CE02/6510/65816/6800/6801/6809/8008/8080/HuC6280/SPC-700/SuperFX library file format "WLAG"
WLA-GB/Z80/6502/65C02/65CE02/65816/6800/6801/6809/8008/8080/HuC6280/SPC-700/SuperFX library file format "WLAG"


bytes description

header:

4 format information,
"WLAG" - WLA-GB/Z80/6502/65C02/65CE02/6510/65816/6800/6801/6809/8008/8080/HuC6280/SPC-700/SuperFX library file version 27 (17-Aug-2021)
"WLAG" - WLA-GB/Z80/6502/65C02/65CE02/65816/6800/6801/6809/8008/8080/HuC6280/SPC-700/SuperFX library file version 27 (17-Aug-2021)
1 misc bits (bit 0 - endianess (1 = big endian)
bit 1 - 65816 indicator (1 == 65816)
bit 2 - 65ce02 indicator (1 == 65ce02))
Expand Down
3 changes: 1 addition & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ WLA DX
======

WLA DX - Yet Another
GB-Z80/Z80/6502/65C02/65CE02/6510/65816/6800/6801/6809/8008/8080/HUC6280/SPC-700/SuperFX
GB-Z80/Z80/6502/65C02/65CE02/65816/6800/6801/6809/8008/8080/HUC6280/SPC-700/SuperFX
Multi Platform Cross Assembler Package

Linux: [![Build Status](https://dev.azure.com/villehelin0486/villehelin/_apis/build/status/vhelin.wla-dx%20Linux?branchName=master)](https://dev.azure.com/villehelin0486/villehelin/_build/latest?definitionId=1&branchName=master)
Expand All @@ -21,7 +21,6 @@ Supported architectures are:
* 6502
* 65C02
* 65CE02
* 6510
* 65816
* 6800
* 6801
Expand Down
258 changes: 244 additions & 14 deletions byte_tester/makefile
Original file line number Diff line number Diff line change
@@ -1,23 +1,253 @@
# CMAKE generated file: DO NOT EDIT!
# Generated by "Unix Makefiles" Generator, CMake Version 3.20

CC=gcc
LD=gcc
# Default target executed when no arguments are given to make.
default_target: all
.PHONY : default_target

CFLAGS= -c -ansi -O0 -g -pedantic -Wall
LDFLAGS =
# Allow only one "make -f Makefile2" at a time, but pass parallelism.
.NOTPARALLEL:

CFILES = main.c
OFILES = main.o
#=============================================================================
# Special targets provided by cmake.

all: $(OFILES) makefile
$(LD) $(LDFLAGS) $(OFILES) -o byte_tester
# Disable implicit rules so canonical targets will work.
.SUFFIXES:

main.o: main.c makefile
$(CC) $(CFLAGS) main.c
# Disable VCS-based implicit rules.
% : %,v

$(OFILES): $(HFILES) $(CFILES)
# Disable VCS-based implicit rules.
% : RCS/%

# Disable VCS-based implicit rules.
% : RCS/%,v

# Disable VCS-based implicit rules.
% : SCCS/s.%

# Disable VCS-based implicit rules.
% : s.%

.SUFFIXES: .hpux_make_needs_suffix_list

# Command-line flag to silence nested $(MAKE).
$(VERBOSE)MAKESILENT = -s

#Suppress display of executed commands.
$(VERBOSE).SILENT:

# A target that is always out of date.
cmake_force:
.PHONY : cmake_force

#=============================================================================
# Set environment variables for the build.

# The shell in which to execute make rules.
SHELL = /bin/sh

# The CMake executable.
CMAKE_COMMAND = /usr/bin/cmake.exe

# The command to remove a file.
RM = /usr/bin/cmake.exe -E rm -f

# Escaping for special characters.
EQUALS = =

# The top-level source directory on which CMake was run.
CMAKE_SOURCE_DIR = /cygdrive/v/wla-dx-master-4

# The top-level build directory on which CMake was run.
CMAKE_BINARY_DIR = /cygdrive/v/wla-dx-master-4

#=============================================================================
# Targets provided globally by CMake.

# Special rule for the target install/strip
install/strip: preinstall
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Installing the project stripped..."
/usr/bin/cmake.exe -DCMAKE_INSTALL_DO_STRIP=1 -P cmake_install.cmake
.PHONY : install/strip

# Special rule for the target install/strip
install/strip/fast: preinstall/fast
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Installing the project stripped..."
/usr/bin/cmake.exe -DCMAKE_INSTALL_DO_STRIP=1 -P cmake_install.cmake
.PHONY : install/strip/fast

# Special rule for the target install/local
install/local: preinstall
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Installing only the local directory..."
/usr/bin/cmake.exe -DCMAKE_INSTALL_LOCAL_ONLY=1 -P cmake_install.cmake
.PHONY : install/local

# Special rule for the target install/local
install/local/fast: preinstall/fast
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Installing only the local directory..."
/usr/bin/cmake.exe -DCMAKE_INSTALL_LOCAL_ONLY=1 -P cmake_install.cmake
.PHONY : install/local/fast

# Special rule for the target edit_cache
edit_cache:
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake cache editor..."
/usr/bin/ccmake.exe -S$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
.PHONY : edit_cache

# Special rule for the target edit_cache
edit_cache/fast: edit_cache
.PHONY : edit_cache/fast

# Special rule for the target package_source
package_source:
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Run CPack packaging tool for source..."
cd /cygdrive/v/wla-dx-master-4 && /usr/bin/cpack.exe --config ./CPackSourceConfig.cmake /cygdrive/v/wla-dx-master-4/CPackSourceConfig.cmake
.PHONY : package_source

# Special rule for the target package_source
package_source/fast: package_source
.PHONY : package_source/fast

# Special rule for the target install
install: preinstall
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Install the project..."
/usr/bin/cmake.exe -P cmake_install.cmake
.PHONY : install

# Special rule for the target install
install/fast: preinstall/fast
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Install the project..."
/usr/bin/cmake.exe -P cmake_install.cmake
.PHONY : install/fast

# Special rule for the target list_install_components
list_install_components:
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Available install components are: \"Unspecified\""
.PHONY : list_install_components

# Special rule for the target list_install_components
list_install_components/fast: list_install_components
.PHONY : list_install_components/fast

# Special rule for the target rebuild_cache
rebuild_cache:
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake to regenerate build system..."
/usr/bin/cmake.exe --regenerate-during-build -S$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
.PHONY : rebuild_cache

# Special rule for the target rebuild_cache
rebuild_cache/fast: rebuild_cache
.PHONY : rebuild_cache/fast

# Special rule for the target package
package: preinstall
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Run CPack packaging tool..."
cd /cygdrive/v/wla-dx-master-4 && /usr/bin/cpack.exe --config ./CPackConfig.cmake
.PHONY : package

# Special rule for the target package
package/fast: package
.PHONY : package/fast

# The main all target
all: cmake_check_build_system
cd /cygdrive/v/wla-dx-master-4 && $(CMAKE_COMMAND) -E cmake_progress_start /cygdrive/v/wla-dx-master-4/CMakeFiles /cygdrive/v/wla-dx-master-4/byte_tester//CMakeFiles/progress.marks
cd /cygdrive/v/wla-dx-master-4 && $(MAKE) $(MAKESILENT) -f CMakeFiles/Makefile2 byte_tester/all
$(CMAKE_COMMAND) -E cmake_progress_start /cygdrive/v/wla-dx-master-4/CMakeFiles 0
.PHONY : all

# The main clean target
clean:
rm $(OFILES) byte_tester *~
cd /cygdrive/v/wla-dx-master-4 && $(MAKE) $(MAKESILENT) -f CMakeFiles/Makefile2 byte_tester/clean
.PHONY : clean

# The main clean target
clean/fast: clean
.PHONY : clean/fast

# Prepare targets for installation.
preinstall: all
cd /cygdrive/v/wla-dx-master-4 && $(MAKE) $(MAKESILENT) -f CMakeFiles/Makefile2 byte_tester/preinstall
.PHONY : preinstall

# Prepare targets for installation.
preinstall/fast:
cd /cygdrive/v/wla-dx-master-4 && $(MAKE) $(MAKESILENT) -f CMakeFiles/Makefile2 byte_tester/preinstall
.PHONY : preinstall/fast

# clear depends
depend:
cd /cygdrive/v/wla-dx-master-4 && $(CMAKE_COMMAND) -S$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 1
.PHONY : depend

# Convenience name for target.
byte_tester/CMakeFiles/byte_tester.dir/rule:
cd /cygdrive/v/wla-dx-master-4 && $(MAKE) $(MAKESILENT) -f CMakeFiles/Makefile2 byte_tester/CMakeFiles/byte_tester.dir/rule
.PHONY : byte_tester/CMakeFiles/byte_tester.dir/rule

# Convenience name for target.
byte_tester: byte_tester/CMakeFiles/byte_tester.dir/rule
.PHONY : byte_tester

# fast build rule for target.
byte_tester/fast:
cd /cygdrive/v/wla-dx-master-4 && $(MAKE) $(MAKESILENT) -f byte_tester/CMakeFiles/byte_tester.dir/build.make byte_tester/CMakeFiles/byte_tester.dir/build
.PHONY : byte_tester/fast

main.o: main.c.o
.PHONY : main.o

# target to build an object file
main.c.o:
cd /cygdrive/v/wla-dx-master-4 && $(MAKE) $(MAKESILENT) -f byte_tester/CMakeFiles/byte_tester.dir/build.make byte_tester/CMakeFiles/byte_tester.dir/main.c.o
.PHONY : main.c.o

main.i: main.c.i
.PHONY : main.i

# target to preprocess a source file
main.c.i:
cd /cygdrive/v/wla-dx-master-4 && $(MAKE) $(MAKESILENT) -f byte_tester/CMakeFiles/byte_tester.dir/build.make byte_tester/CMakeFiles/byte_tester.dir/main.c.i
.PHONY : main.c.i

main.s: main.c.s
.PHONY : main.s

# target to generate assembly for a file
main.c.s:
cd /cygdrive/v/wla-dx-master-4 && $(MAKE) $(MAKESILENT) -f byte_tester/CMakeFiles/byte_tester.dir/build.make byte_tester/CMakeFiles/byte_tester.dir/main.c.s
.PHONY : main.c.s

# Help Target
help:
@echo "The following are some of the valid targets for this Makefile:"
@echo "... all (the default if no target is provided)"
@echo "... clean"
@echo "... depend"
@echo "... edit_cache"
@echo "... install"
@echo "... install/local"
@echo "... install/strip"
@echo "... list_install_components"
@echo "... package"
@echo "... package_source"
@echo "... rebuild_cache"
@echo "... byte_tester"
@echo "... main.o"
@echo "... main.i"
@echo "... main.s"
.PHONY : help



#=============================================================================
# Special targets to cleanup operation of make.

# Special rule to run CMake to check the build system integrity.
# No rule that depends on this can have commands that come from listfiles
# because they might be regenerated.
cmake_check_build_system:
cd /cygdrive/v/wla-dx-master-4 && $(CMAKE_COMMAND) -S$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 0
.PHONY : cmake_check_build_system

install:
make ; cp byte_tester ../binaries

0 comments on commit 1006c3f

Please sign in to comment.