blockworks-foundation
/
solana
mirror of https://github.com/blockworks-foundation/solana.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix C programs

This commit is contained in:
Jack May 2018-10-30 22:52:59 -07:00 committed by Michael Vines
parent 0529f36fde
commit bc13248e1c
4 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
programs/bpf/c/sdk/bpf.mk
View File

@ -6,7 +6,7 @@ ifneq ($(V),1)
_@ :=@ _@ :=@
endif endif
SYSTEM_INC_DIRS ?= -isystem $(dir $(lastword $(MAKEFILE_LIST)))inc SYSTEM_INC_DIRS ?= -Isystem -I$(dir $(lastword $(MAKEFILE_LIST)))inc
INC_DIRS ?= INC_DIRS ?=
SRC_DIR ?= ./src SRC_DIR ?= ./src
OUT_DIR ?= ./out OUT_DIR ?= ./out
@ -50,11 +50,13 @@ help:
@echo ' - Output files will be placed in the directory: $(OUT_DIR)' @echo ' - Output files will be placed in the directory: $(OUT_DIR)'
@echo '' @echo ''
@echo 'User settings' @echo 'User settings'
@echo ' - The following setting are overridable on the command line, default values shown' @echo ' - The following setting are overridable on the command line, default values shown:'
@echo ' - Show commands:' @echo ' - Show commands:'
@echo ' V=1' @echo ' V=1'
@echo ' - List of include dirs:' @echo ' - List of include dirs:'
@echo ' INC_DIRS=$(INC_DIRS)' @echo ' INC_DIRS=$(INC_DIRS)'
@echo ' - List of systme include dirs:'
@echo ' INC_DIRS=$(SYSTEM_INC_DIRS)'
@echo ' - Location of source files:' @echo ' - Location of source files:'
@echo ' SRC_DIR=$(SRC_DIR)' @echo ' SRC_DIR=$(SRC_DIR)'
@echo ' - Location to place output files:' @echo ' - Location to place output files:'
@ -88,7 +90,7 @@ $(OUT_DIR)/%.o: $(OUT_DIR)/%.bc
@echo "[llc] $@ ($<)" @echo "[llc] $@ ($<)"
$(_@)$(LLC) $(LLC_FLAGS) -o $@ $< $(_@)$(LLC) $(LLC_FLAGS) -o $@ $<
-include $(wildcard $(OUT_DIR)/*.d) -include $(wildcard $(OUT_DIR)/%.d)
PROGRAM_NAMES := $(notdir $(basename $(wildcard src/*.c))) PROGRAM_NAMES := $(notdir $(basename $(wildcard src/*.c)))

6
programs/bpf/c/sdk/inc/sol_bpf.h
View File

@ -99,8 +99,8 @@ typedef struct {
SolPubkey *key; /** Public Key of the account owner */ SolPubkey *key; /** Public Key of the account owner */
int64_t *tokens; /** Numer of tokens owned by this account */ int64_t *tokens; /** Numer of tokens owned by this account */
uint64_t userdata_len; /** Length of userdata in bytes */ uint64_t userdata_len; /** Length of userdata in bytes */
uint8_t *userdata; /** On-chain data owned by this account */ const uint8_t *userdata; /** On-chain data owned by this account */
SolPubkey *program_id; /** Program that owns this account */ const SolPubkey *program_id; /** Program that owns this account */
} SolKeyedAccounts; } SolKeyedAccounts;
/** /**
@ -154,7 +154,7 @@ SOL_FN_PREFIX bool sol_deserialize(
const uint8_t *input, const uint8_t *input,
uint64_t num_ka, uint64_t num_ka,
SolKeyedAccounts *ka, SolKeyedAccounts *ka,
uint8_t **data, const uint8_t **data,
uint64_t *data_len uint64_t *data_len
) { ) {
if (num_ka != *(uint64_t *)input) { if (num_ka != *(uint64_t *)input) {

2
programs/bpf/c/src/move_funds.c
View File

@ -13,7 +13,7 @@
extern bool entrypoint(const uint8_t *input) { extern bool entrypoint(const uint8_t *input) {
SolKeyedAccounts ka[NUM_KA]; SolKeyedAccounts ka[NUM_KA];
uint8_t *data; const uint8_t *data;
uint64_t data_len; uint64_t data_len;
if (!sol_deserialize(input, NUM_KA, ka, &data, &data_len)) { if (!sol_deserialize(input, NUM_KA, ka, &data, &data_len)) {

2
programs/bpf/c/src/noop.c
View File

@ -13,7 +13,7 @@
extern bool entrypoint(const uint8_t *input) { extern bool entrypoint(const uint8_t *input) {
SolKeyedAccounts ka[NUM_KA]; SolKeyedAccounts ka[NUM_KA];
uint8_t *data; const uint8_t *data;
uint64_t data_len; uint64_t data_len;
if (!sol_deserialize(input, NUM_KA, ka, &data, &data_len)) { if (!sol_deserialize(input, NUM_KA, ka, &data, &data_len)) {