Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Rename and move cx export/trampoline files #756

Merged
merged 2 commits into from
Aug 29, 2024
Merged

Rename and move cx export/trampoline files #756

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3f2cb14
Rename Cx area management variables
nroggeman-ledger Aug 28, 2024
36bbf8c
Rename and move some Cx trampoline files in OS
nroggeman-ledger Aug 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion include/cx_stubs.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#pragma once

// auto-generated by cxsdk.py
// auto-generated by shared_export.py
#define _NR_cx_aes_dec_block 0x00
#define _NR_cx_aes_enc_block 0x01
#define _NR_cx_aes_gcm_check_tag 0x02
Expand Down
15 changes: 0 additions & 15 deletions include/cx_trampoline.h
View file
Open in desktop

This file was deleted.

15 changes: 15 additions & 0 deletions include/shared_trampoline.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
#pragma once

#include "bolos_target.h"

#if defined(TARGET_NANOS)
#define SHARED_TRAMPOLINE_ADDR 0x00120001
#elif defined(TARGET_NANOX)
#define SHARED_TRAMPOLINE_ADDR 0x00210001
#elif defined(TARGET_NANOS2)
#define SHARED_TRAMPOLINE_ADDR 0x00810001
#elif defined(TARGET_STAX)
#define SHARED_TRAMPOLINE_ADDR 0x00818001
#elif defined(TARGET_FLEX)
#define SHARED_TRAMPOLINE_ADDR 0x00818001
#endif
2 changes: 1 addition & 1 deletion lib_cxng/cx.export
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# This file contains the functions exported by cxlib. It is used by cxsdk.py to
# This file contains the functions exported by cxlib. It is used by shared_export.py to
# generate asm stubs for the SDK and the CX functions table in cxlib.
#
# Making changes to this file (ie. removal, addition, ordering) require apps to
Expand Down
172 changes: 0 additions & 172 deletions lib_cxng/src/cx_exported_functions.c
View file
Open in desktop

This file was deleted.

16 changes: 0 additions & 16 deletions lib_cxng/src/cx_trampoline.s
View file
Open in desktop

This file was deleted.

6 changes: 3 additions & 3 deletions src/cx_stubs.S
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// auto-generated by cxsdk.py
#include "cx_trampoline.h"
// auto-generated by shared_export.py
#include "shared_trampoline.h"
#include "cx_stubs.h"

.text
Expand Down Expand Up @@ -163,5 +163,5 @@ CX_TRAMPOLINE _NR_cx_cmac_finish cx_cmac_finish

.thumb_func
cx_trampoline_helper:
ldr r1, =CX_TRAMPOLINE_ADDR // _cx_trampoline address
ldr r1, =SHARED_TRAMPOLINE_ADDR // _shared_trampoline address
bx r1
Loading