diff options
| author | djm <> | 2005-04-29 05:39:33 +0000 |
|---|---|---|
| committer | djm <> | 2005-04-29 05:39:33 +0000 |
| commit | 68edd00d9258df93b1366c71ac124e0cadf7bc08 (patch) | |
| tree | 3ce4ae2a9747bbc11aed1f95f9bbea92c41f8683 /src/lib/libcrypto/perlasm/x86ms.pl | |
| parent | f396ed0f5ce0af56bfde2e75e15cf1f52924c779 (diff) | |
| download | openbsd-68edd00d9258df93b1366c71ac124e0cadf7bc08.tar.gz openbsd-68edd00d9258df93b1366c71ac124e0cadf7bc08.tar.bz2 openbsd-68edd00d9258df93b1366c71ac124e0cadf7bc08.zip | |
resolve conflicts
Diffstat (limited to 'src/lib/libcrypto/perlasm/x86ms.pl')
| -rw-r--r-- | src/lib/libcrypto/perlasm/x86ms.pl | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/lib/libcrypto/perlasm/x86ms.pl b/src/lib/libcrypto/perlasm/x86ms.pl index fbb4afb9bd..b6bd744057 100644 --- a/src/lib/libcrypto/perlasm/x86ms.pl +++ b/src/lib/libcrypto/perlasm/x86ms.pl | |||
| @@ -160,6 +160,7 @@ sub main'not { &out1("not",@_); } | |||
| 160 | sub main'call { &out1("call",($_[0]=~/^\$L/?'':'_').$_[0]); } | 160 | sub main'call { &out1("call",($_[0]=~/^\$L/?'':'_').$_[0]); } |
| 161 | sub main'ret { &out0("ret"); } | 161 | sub main'ret { &out0("ret"); } |
| 162 | sub main'nop { &out0("nop"); } | 162 | sub main'nop { &out0("nop"); } |
| 163 | sub main'movz { &out2("movzx",@_); } | ||
| 163 | 164 | ||
| 164 | sub out2 | 165 | sub out2 |
| 165 | { | 166 | { |