Skip to content

Commit

Permalink
chore: lib/ cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
d0p1s4m4 committed Mar 24, 2024
1 parent 2b425ca commit 9a5b474
Show file tree
Hide file tree
Showing 10 changed files with 59 additions and 38 deletions.
4 changes: 2 additions & 2 deletions lib/Makefile
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
SUBDIRS = crypto
SUBDIRS = csu crypto

TOPGOALS = all clean install

.PHONY: $(SUBDIRS)
$(SUBDIRS):
@echo "📁 lib/$@"
@DESTDIR=$(DESTDIR)/lib $(MAKE) -C $@ $(MAKECMDGOALS)
@DESTDIR=$(DESTDIR)/usr/lib $(MAKE) -C $@ $(MAKECMDGOALS)

.PHONY: $(TOPGOALS)
$(TOPGOALS): $(SUBDIRS)
16 changes: 14 additions & 2 deletions lib/crypto/Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,17 @@
all:
TARGET = libcrypto.a
OBJS = hash/sha256.o

all: $(TARGET)

$(TARGET): $(OBJS)
$(AR) rcs $@ $^

%.o: %.asm
$(AS) $< $@

clean:
$(RM) $(TARGET) $(OBJS)

install:
install: $(TARGET)
@ mkdir -p $(DESTDIR)
install $(TARGET) $(DESTDIR)
3 changes: 0 additions & 3 deletions lib/crypto/hash/keccak.s

This file was deleted.

23 changes: 12 additions & 11 deletions lib/crypto/hash/sha256.s → lib/crypto/hash/sha256.asm
Original file line number Diff line number Diff line change
Expand Up @@ -5,22 +5,23 @@
;
; About: CPU compatibility
; /!\ Only work on *486+* due to bswap for now.
[BITS 32]
format COFF
use32

section .rodata
section '.data' data
; Constant: K
; SHA-256 round constants
K:
dd 0x428a2f98, 0x71374491, 0xb5c0fbcf, 0xe9b5dba5, 0x3956c25b, 0x59f111f1, 0x923f82a4, 0xab1c5ed5,
dd 0xd807aa98, 0x12835b01, 0x243185be, 0x550c7dc3, 0x72be5d74, 0x80deb1fe, 0x9bdc06a7, 0xc19bf174,
dd 0xe49b69c1, 0xefbe4786, 0x0fc19dc6, 0x240ca1cc, 0x2de92c6f, 0x4a7484aa, 0x5cb0a9dc, 0x76f988da,
dd 0x983e5152, 0xa831c66d, 0xb00327c8, 0xbf597fc7, 0xc6e00bf3, 0xd5a79147, 0x06ca6351, 0x14292967,
dd 0x27b70a85, 0x2e1b2138, 0x4d2c6dfc, 0x53380d13, 0x650a7354, 0x766a0abb, 0x81c2c92e, 0x92722c85,
dd 0xa2bfe8a1, 0xa81a664b, 0xc24b8b70, 0xc76c51a3, 0xd192e819, 0xd6990624, 0xf40e3585, 0x106aa070,
dd 0x19a4c116, 0x1e376c08, 0x2748774c, 0x34b0bcb5, 0x391c0cb3, 0x4ed8aa4a, 0x5b9cca4f, 0x682e6ff3,
dd 0x428a2f98, 0x71374491, 0xb5c0fbcf, 0xe9b5dba5, 0x3956c25b, 0x59f111f1, 0x923f82a4, 0xab1c5ed5
dd 0xd807aa98, 0x12835b01, 0x243185be, 0x550c7dc3, 0x72be5d74, 0x80deb1fe, 0x9bdc06a7, 0xc19bf174
dd 0xe49b69c1, 0xefbe4786, 0x0fc19dc6, 0x240ca1cc, 0x2de92c6f, 0x4a7484aa, 0x5cb0a9dc, 0x76f988da
dd 0x983e5152, 0xa831c66d, 0xb00327c8, 0xbf597fc7, 0xc6e00bf3, 0xd5a79147, 0x06ca6351, 0x14292967
dd 0x27b70a85, 0x2e1b2138, 0x4d2c6dfc, 0x53380d13, 0x650a7354, 0x766a0abb, 0x81c2c92e, 0x92722c85
dd 0xa2bfe8a1, 0xa81a664b, 0xc24b8b70, 0xc76c51a3, 0xd192e819, 0xd6990624, 0xf40e3585, 0x106aa070
dd 0x19a4c116, 0x1e376c08, 0x2748774c, 0x34b0bcb5, 0x391c0cb3, 0x4ed8aa4a, 0x5b9cca4f, 0x682e6ff3
dd 0x748f82ee, 0x78a5636f, 0x84c87814, 0x8cc70208, 0x90befffa, 0xa4506ceb, 0xbef9a3f7, 0xc67178f2

section .text
section '.text' code

; Function: sha256_compute_block
sha256_compute_block:
Expand Down Expand Up @@ -89,7 +90,7 @@ sha256_internal:
; out:
; none
;
global sha256
public sha256
sha256:
push ebp
mov ebp, esp
Expand Down
2 changes: 0 additions & 2 deletions lib/crypto/sign/ecdsa.s

This file was deleted.

13 changes: 13 additions & 0 deletions lib/csu/Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
TARGET = crt0.o

all: $(TARGET)

%.o: %.asm
$(AS) $< $@

clean:
$(RM) $(TARGET)

install: $(TARGET)
@ mkdir -p $(DESTDIR)
install $(TARGET) $(DESTDIR)
18 changes: 18 additions & 0 deletions lib/csu/crt0.asm
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
format COFF
use32

public _start

extrn main
extrn exit

section '.text' code

public _start
_start:

xor ebp, ebp
call main

call exit

10 changes: 0 additions & 10 deletions lib/pls/runtime/crt0.s

This file was deleted.

5 changes: 0 additions & 5 deletions lib/pls/std/error.pls

This file was deleted.

3 changes: 0 additions & 3 deletions lib/pls/std/io/file.pls

This file was deleted.

0 comments on commit 9a5b474

Please sign in to comment.