Skip to content
This repository has been archived by the owner on Jul 1, 2022. It is now read-only.

Switching over to HikariCore #4

Open
woachk opened this issue Apr 10, 2020 · 6 comments
Open

Switching over to HikariCore #4

woachk opened this issue Apr 10, 2020 · 6 comments

Comments

@woachk
Copy link
Member

woachk commented Apr 10, 2020

Before switching over to https://github.com/HikariRebooted/HikariCore and pushing it as a part of the HikariObfuscator organisation, this repository should perhaps be renamed.

@Naville
Copy link
Member

Naville commented Apr 11, 2020

What do you mean though? Imma a bit confused.
Current master of this repo already contains extra fixed unless you've manually ported them to Rebooted

@Naville
Copy link
Member

Naville commented Apr 11, 2020

Since technically this is still de facto Core with latest bug fixes and patches, IMO we should probably still treat it as one. Your fork could be integrated as a new sub-repo and use git submodule to reference stuffs in the real Core

@Naville
Copy link
Member

Naville commented Apr 11, 2020

For now the roadmap would be, IMHO:

  • Update Reboot/Core with submodules referencing master
  • Update master 's CMake with options deciding if we should use our shipped legacy LLVM passes or built-in ones.
  • Transfer Reboot to this organization.

These should do for LLVM9 while we are at it, the next step would be getting rid of the legacy pass, which involves fixing a bit known bugs here and there in the master

@woachk
Copy link
Member Author

woachk commented Apr 11, 2020

Hello, I manually ported over the fixes yesterday.

Reboot/HikariCore is not exactly the same source tree either because of compatibility concerns with newer LLVM.

@Naville
Copy link
Member

Naville commented Apr 14, 2020

@woachk Unless I'm misunderstanding here, probably 99% of the stuff in src/Passes is still the same as master. So what I mean here is change that directory to submodule and in Core's CMakeLists.txt, add something like:

option(BUILD_GENERIC_LOADER "Build Generic AppleClang Loader" OFF)
IF(BUILD_GENERIC_LOADER)
    add_compile_definitions(-DHIKARI_GENERIC_LOADER)
ENDIF()

and then update the master core into something like:

#ifdef HIKARI_GENERIC_LOADER
dosth()
#else
dosthelse()
#endif

This in theory allows us to spend the minimum effort on manually porting fixes while keep everything tidy, IMHO

@Naville
Copy link
Member

Naville commented Apr 14, 2020

Although I'm open to suggestions with a more detailed guide on what needs to be done on my side

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

No branches or pull requests

2 participants