Skip to content

Commit

Permalink
Merge branch with instantiate.*
Browse files Browse the repository at this point in the history
The following steps allow us to keep the history of both execute.* and instantiate.*:
1. In branch1 rename execute.* -> instantiate.* (git's history will consider instantiate to be the continuation of execute)
2. In branch1 remove execution code from instantiate.*
3. In branch2 rename instantiation code from execute.*
4. Merge branch1 into branch2.
  • Loading branch information
gumb0 committed Sep 9, 2020
2 parents 799d75f + 7cc4f53 commit 48fd8f8
Show file tree
Hide file tree
Showing 4 changed files with 618 additions and 1 deletion.
2 changes: 2 additions & 0 deletions lib/fizzy/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ target_sources(
exceptions.hpp
execute.cpp
execute.hpp
instantiate.cpp
instantiate.hpp
instructions.cpp
instructions.hpp
leb128.hpp
Expand Down
Loading

0 comments on commit 48fd8f8

Please sign in to comment.