Skip to content

Optimize shadow stack pass #1667

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

Merged
merged 4 commits into from
Feb 22, 2021
Merged

Optimize shadow stack pass #1667

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a614ec7
Optimize shadow stack pass
dcodeIO Feb 4, 2021
34d6186
update fixtures
dcodeIO Feb 4, 2021
8efa9e6
Merge branch 'master' into optimize-shadowstack
dcodeIO Feb 21, 2021
7c3c739
matchTostack -> matchPattern
dcodeIO Feb 22, 2021
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
Prev Previous commit
matchTostack -> matchPattern
  • Loading branch information
@dcodeIO
dcodeIO committed Feb 22, 2021
commit 7c3c73944fa37af175791ecdaae096b9b6cb610c
6 changes: 3 additions & 3 deletions src/passes/shadowstack.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ type SlotMap = Map<LocalIndex,SlotIndex>;
type TempMap = Map<NativeType,LocalIndex>;

/** Attempts to match the `__tostack(value)` pattern. Returns `value` if a match, otherwise `0`. */
function matchTostack(module: Module, expr: ExpressionRef): ExpressionRef {
function matchPattern(module: Module, expr: ExpressionRef): ExpressionRef {
if (_BinaryenExpressionGetId(expr) == ExpressionId.Call && module.readStringCached(_BinaryenCallGetTarget(expr)) == BuiltinNames.tostack) {
assert(_BinaryenCallGetNumOperands(expr) == 1);
return _BinaryenCallGetOperandAt(expr, 0);
Expand Down Expand Up @@ -332,7 +332,7 @@ export class ShadowStackPass extends Pass {
var numSlots = 0;
for (let i = 0, k = operands.length; i < k; ++i) {
let operand = operands[i];
let match = matchTostack(module, operand);
let match = matchPattern(module, operand);
if (!match) continue;
if (!needsSlot(module, match)) {
operands[i] = match;
Expand Down Expand Up @@ -422,7 +422,7 @@ export class ShadowStackPass extends Pass {
visitLocalSet(localSet: ExpressionRef): void {
let module = this.module;
let value = _BinaryenLocalSetGetValue(localSet);
let match = matchTostack(module, value);
let match = matchPattern(module, value);
if (!match) return;
if (!needsSlot(module, match)) {
_BinaryenLocalSetSetValue(localSet, match);
Expand Down