Commit graph

341 commits

Author SHA1 Message Date
Tyler Wilding 911a115c61 Merge remote-tracking branch 'water111/master' into ci/actions-improvements 2020-10-09 21:18:25 -04:00
Tyler Wilding d868b35c57 Disable ccache for now, causing coverage problems 2020-10-09 21:18:05 -04:00
water111 0a231afdbb
Merge pull request #67 from xTVaser/generative-tests
Create more general Test Framework and Organize the bulk of current tests
2020-10-09 21:11:34 -04:00
Tyler Wilding a5972e5111 Github Actions enhancements 2020-10-09 21:08:16 -04:00
Tyler Wilding 4429632618 Prevent overflow causing negative numbers to be positive 2020-10-09 20:45:55 -04:00
Tyler Wilding bf3344cdd3 Remove negative hex test, windows is too good 2020-10-09 20:33:35 -04:00
Tyler Wilding 6e1dea4a65 Disable -Wshadow, also flakey test, or linux issue? 2020-10-09 20:23:31 -04:00
Tyler Wilding c34c0a898d Use ubuntu 20.04 which has GCC 8 atleast 2020-10-09 20:15:44 -04:00
Tyler Wilding f712c615ce Fix remaining failing tests 2020-10-09 19:44:16 -04:00
Tyler Wilding 76bede157d Merge remote-tracking branch 'water111/master' into generative-tests 2020-10-09 13:31:08 -04:00
Tyler Wilding b99b63af65 lint: Clang format 2020-10-09 13:24:55 -04:00
Tyler Wilding 83f2751795 Make all tests hermetic, only the tests with kernel left 2020-10-09 13:23:41 -04:00
Shay 0f916ed81e More minor fixes
spdlog now builds as a library with nasm workaround
2020-10-08 22:39:12 -06:00
Shay 4ddacae897 Merge branch 'logging-test' into logging 2020-10-08 22:21:22 -06:00
doctashay e97098ce7d Fixes
It looks like spdlog is fully integrated as a git submodule now? Should be good to merge
2020-10-08 22:19:56 -06:00
doctashay 23d0880793 Git submodule stuff 2020-10-08 22:15:27 -06:00
water111 adc09d7c79
Merge pull request #69 from xTVaser/cmake-pprint-workaround
Fix CMake/NASM issue on windows caused by spdlog.  Temporarily workaround slow pprint test
2020-10-08 23:55:06 -04:00
Tyler Wilding 274418f12a Reduce time on windows pprint test until pretty-printer is improved 2020-10-08 23:48:36 -04:00
Tyler Wilding 1574c95e73 Workaround NASM bug on Windows/MSVC
https://gitlab.kitware.com/cmake/cmake/-/issues/19751
2020-10-08 23:48:07 -04:00
doctashay 4a443132ff Merge branch 'logging' of https://github.com/doctashay/jak-project into logging 2020-10-08 09:17:24 -06:00
doctashay 8d9b87cfed Cleanup PR 2020-10-08 09:16:34 -06:00
doctashay a2b744dfe0
Merge branch 'master' into logging 2020-10-08 09:08:13 -06:00
Tyler Wilding df6e6dd2a2 Create new categorized test classes, for the most part just a copy of current tests into new framework 2020-10-08 00:06:48 -04:00
Tyler Wilding 097a9157f5 Copy over LISP code 2020-10-08 00:05:01 -04:00
doctashay 9bbb47006c Small fixes
Logging names are now less ambiguous. We can adopt one of two styling conventions: create a logger object for each component of the project, and log every output into a large jak.log file; or we can have separate text files for the compiler log, runtime log, etc. I think the former will be the most efficient but may also make filtering harder.

Also replaced more old prints with spdlog equivalents
2020-10-06 16:18:59 -06:00
water111 a64dd6c90b
Add CFG to IR decompiler pass (#60)
* add some more cfg ir stuff

* add cond with else

* add type of recognition

* add cond to compare conversion

* finally all conds are passing

* started sc recognize, but ash min and max should be recognized first

* fix ash showing up as sc

* add abs

* fix merge issues

* try building goos with optimizations on

* sc mostly working, still need to fix right aligned nesting

* ands and ors are converting correctly now

* clean up
2020-10-06 18:14:27 -04:00
doctashay 953e7c1ad5 Temp fix for spdlog + initial log to file implementation
Reduces verbose output by logging additional information to logs/game.log.
2020-10-06 16:03:33 -06:00
Shay c5681a6cc7 Auto stash before merge of "logging" and "upstream/w/cfg_2_ir" 2020-10-06 15:35:57 -06:00
Shay 4f091fd62a Merge remote-tracking branch 'upstream/w/cfg_2_ir' into logging 2020-10-06 15:31:16 -06:00
water 387cce962d sc mostly working, still need to fix right aligned nesting 2020-10-05 21:38:45 -04:00
Shay 2d9f8c01fe Merge remote-tracking branch 'upstream/w/cfg_2_ir' into logging 2020-10-04 20:29:39 -06:00
water 6277bc86cf try building goos with optimizations on 2020-10-04 17:28:45 -04:00
water 5e2b9ddf6e fix merge issues 2020-10-04 17:23:30 -04:00
water d464ad549b Merge branch 'master' of https://github.com/water111/jak-project into w/cfg_2_ir 2020-10-04 17:23:07 -04:00
water111 b102d22dd9
Replace Form with goos::Object (#64)
* add pretty printing to goos form

* temp

* fix format

* fix format

* fix windows build

* again

* windows

* Revert "windows"

This reverts commit b7d448e733.

* windows again

* give up and just add a getter function
2020-10-04 17:08:10 -04:00
water f70ae6dad3 add abs 2020-10-04 11:37:47 -04:00
water 4b90634e93 fix ash showing up as sc 2020-10-04 10:44:28 -04:00
water e195e2b299 started sc recognize, but ash min and max should be recognized first 2020-10-03 21:30:58 -04:00
water 5bcd10b5b0 finally all conds are passing 2020-10-03 20:36:21 -04:00
water 0fbffcd409 add cond to compare conversion 2020-10-03 18:36:02 -04:00
Tyler Wilding 663453769c Final polish on the integer tests, time to start converting the rest 2020-10-03 18:32:01 -04:00
water b7cee7b666 add type of recognition 2020-10-03 15:27:17 -04:00
water 649a8879e5 Merge branch 'master' of https://github.com/water111/jak-project into w/cfg_2_ir 2020-10-03 10:42:52 -04:00
water111 d03080c463
Build spdlog as a shared library (#59)
* change build settings for spdlog

* fix typo

* trying with j4 now

* try as a shared library

* add shadow warning back
2020-10-03 10:33:20 -04:00
doctashay c2cb053a5d
spdlog implementation (#58)
* Commit new spdlog implementation 

Hopefully resolves Linux build dependency errors

* clang formatting

* Fix Linux-only definition

Found the culprit!

* More Linux fixes

Linus Torvalds have mercy on my soul

* Replace printf logging with spdlog equivalent

Preserve previous printfs in comments for now. Spdlog needs to be configured to be thread-safe. Few additional printfs to convert later. No changes have been made to GOAL's internal printing system

* clang-format stuff

* ugh more clang-format

why

* Another shot

* CMakeLists.txt update

Fix issues related to spdlog version targeting

* Remove old prints + fix log types

Up next is the transition to a git submodule, should be simple enough

* spdlog is now a git submodule

* adapted for project

* Linux fix

* More fixes

Yikes

* Update for linux

I should really fix my WSL environment

* Update workflow.yaml

Hopefully will resolve issues with GitHub Actions on Linux
2020-10-03 09:39:04 -04:00
water 0094594f69 add cond with else 2020-10-03 09:32:26 -04:00
doctashay b4b0ee3c4a Update workflow.yaml
Hopefully will resolve issues with GitHub Actions on Linux
2020-10-02 22:32:09 -06:00
water 072283e442 add some more cfg ir stuff 2020-10-02 16:21:25 -04:00
doctashay ec64e06e9e Update for linux
I should really fix my WSL environment
2020-10-02 14:12:41 -06:00
doctashay 7ad253dad1 More fixes
Yikes
2020-10-02 14:08:50 -06:00