switcher: rename _skip_compartment_call to _after Co-authored-by: Robert Norton <robert.norton@microsoft.com>
diff --git a/sdk/core/switcher/entry.S b/sdk/core/switcher/entry.S index 387a2d1..8a84b3d 100644 --- a/sdk/core/switcher/entry.S +++ b/sdk/core/switcher/entry.S
@@ -340,8 +340,8 @@ zeroRegisters tp, t1, t2, s0, s1 cjalr cra - .globl switcher_skip_compartment_call -switcher_skip_compartment_call: + .globl switcher_after_compartment_call +switcher_after_compartment_call: // If we are doing a forced unwind of the trusted stack then we do almost // exactly the same as a normal unwind. We will jump here from the // exception path (.Lforce_unwind) @@ -419,7 +419,7 @@ .Lstack_too_small: li a0, -ENOTENOUGHSTACK li a1, 0 - j switcher_skip_compartment_call + j switcher_after_compartment_call .size compartment_switcher_entry, . - compartment_switcher_entry // the entry point of all exceptions and interrupts @@ -588,7 +588,7 @@ .Lforce_unwind: li a0, -ECOMPARTMENTFAIL li a1, 0 - j switcher_skip_compartment_call + j switcher_after_compartment_call // If we have run out of trusted stack, then just restore the caller's state
diff --git a/sdk/firmware.ldscript.in b/sdk/firmware.ldscript.in index a9a3956..36997dd 100644 --- a/sdk/firmware.ldscript.in +++ b/sdk/firmware.ldscript.in
@@ -163,7 +163,7 @@ # Compartment switcher end SHORT(.compartment_switcher_end - .compartment_switcher_start); # Cross-compartment call return path - SHORT(switcher_skip_compartment_call - .compartment_switcher_start); + SHORT(switcher_after_compartment_call - .compartment_switcher_start); # Compartment switcher sealing key SHORT(compartment_switcher_sealing_key - .compartment_switcher_start); # Switcher's copy of the scheduler's PCC.