Skip to content

Commit

Permalink
Update makefiles and README after merging in PDLs
Browse files Browse the repository at this point in the history
As PDLs are now part of Pharo-ArchC repository, there's no need to check
out PDL. This commit updates makefiles and README accordingly.

There's one issue with RISC-V PDL as it uses to upsteam `riscv-opcodes`
to provide list of instructions and encodings. Technically it is an
submodule so a special care is needed to make sure it is checked out.
This is not a problem when one is using makefiles as they care for this,
but it is a problem when relying solely on Iceberg / Metacello to load
ArchC since there's no support for submodules.
  • Loading branch information
janvrany committed Aug 6, 2024
1 parent 8537cc3 commit 8d801e0
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 40 deletions.
17 changes: 4 additions & 13 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,19 +27,10 @@ Either use shortcut:
1. Clone the repository

```
git clone https://github.com/shingarov/Pharo-ArchC ArchC
```
2. Get PDLs:
```
cd ArchC
./get-pdls.sh
git clone --recurse-submodules https://github.com/shingarov/Pharo-ArchC ArchC
```
Alternatively, you may symlink `pdl` directory wherever you keep your PDLs
3. Download Pharo
2. Download Pharo
```
mkdir ArchC/pharo
Expand All @@ -49,7 +40,7 @@ Either use shortcut:
curl https://get.pharo.org/64/80+vm | bash
```
4. Load code into Pharo image:
3. Load code into Pharo image:
```
./pharo Pharo.image save archc
Expand All @@ -67,7 +58,7 @@ Either use shortcut:
2. Clone the repository:
````
git clone https://github.com/shingarov/Pharo-ArchC.git.git
git clone --recurse-submodules https://github.com/shingarov/Pharo-ArchC.git.git
````
3. In Smalltalk/X, execute:
Expand Down
15 changes: 0 additions & 15 deletions get-pdls.sh

This file was deleted.

10 changes: 4 additions & 6 deletions pharo/GNUmakefile
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,10 @@ MACHINEARITHMETIC_BRANCH ?= pure-z3
$(eval $(call git-clone-local,MACHINEARITHMETIC_DIR,$(MACHINEARITHMETIC_URL),$(MACHINEARITHMETIC_BRANCH)))
endif

ifndef ARCHC_PDL_DIR
ARCHC_PDL_DIR := ../pdl
ARCHC_PDL_URL ?= https://github.com/janvrany/Pharo-ArchC-PDL.git
ARCHC_PDL_BRANCH ?= master
$(eval $(call git-clone-local,ARCHC_PDL_DIR,$(ARCHC_PDL_URL),$(ARCHC_PDL_BRANCH)))
endif
prereq:: ../pdl/riscv/riscv-opcodes/opcodes-rv32i

../pdl/riscv/riscv-opcodes/opcodes-rv32i:
git submodule update --init --recursive $(dir $@)

build: prereq $(PROJECT).image
@echo ""
Expand Down
10 changes: 4 additions & 6 deletions stx/GNUmakefile
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,10 @@ MACHINEARITHMETIC_BRANCH ?= pure-z3
$(eval $(call git-clone-local,MACHINEARITHMETIC_DIR,$(MACHINEARITHMETIC_URL),$(MACHINEARITHMETIC_BRANCH)))
endif

ifndef ARCHC_PDL_DIR
ARCHC_PDL_DIR := ../pdl
ARCHC_PDL_URL ?= https://github.com/janvrany/Pharo-ArchC-PDL.git
ARCHC_PDL_BRANCH ?= master
$(eval $(call git-clone-local,ARCHC_PDL_DIR,$(ARCHC_PDL_URL),$(ARCHC_PDL_BRANCH)))
endif
prereq:: ../pdl/riscv/riscv-opcodes/opcodes-rv32i

../pdl/riscv/riscv-opcodes/opcodes-rv32i:
git submodule update --init --recursive $(dir $@)

build: prereq
@echo "To run Smalltalk/X with $(PROJECT) loaded, run:"
Expand Down

0 comments on commit 8d801e0

Please sign in to comment.