diff options
author | miod <> | 2014-05-01 22:25:13 +0000 |
---|---|---|
committer | miod <> | 2014-05-01 22:25:13 +0000 |
commit | 031f640e84754f48f8bd28e4e489d6db7e922022 (patch) | |
tree | 5db8d9e0bc6b69c032134145e318812415f2dcb3 /src/lib | |
parent | cd8f7e47052cd0d9b5f1579a0e1ea5bde5af04e0 (diff) | |
download | openbsd-031f640e84754f48f8bd28e4e489d6db7e922022.tar.gz openbsd-031f640e84754f48f8bd28e4e489d6db7e922022.tar.bz2 openbsd-031f640e84754f48f8bd28e4e489d6db7e922022.zip |
Remove unreferenced OPENSSL_instrument_bus and OPENSSL_instrument_bus2 routines.
Diffstat (limited to 'src/lib')
-rw-r--r-- | src/lib/libcrypto/armv4cpuid.S | 18 | ||||
-rw-r--r-- | src/lib/libcrypto/pariscid.pl | 87 | ||||
-rw-r--r-- | src/lib/libssl/src/crypto/armv4cpuid.S | 18 | ||||
-rw-r--r-- | src/lib/libssl/src/crypto/pariscid.pl | 87 |
4 files changed, 0 insertions, 210 deletions
diff --git a/src/lib/libcrypto/armv4cpuid.S b/src/lib/libcrypto/armv4cpuid.S index ba86c9709a..2354b39a55 100644 --- a/src/lib/libcrypto/armv4cpuid.S +++ b/src/lib/libcrypto/armv4cpuid.S | |||
@@ -77,24 +77,6 @@ OPENSSL_wipe_cpu: | |||
77 | .word 0xe12fff1e @ bx lr | 77 | .word 0xe12fff1e @ bx lr |
78 | .size OPENSSL_wipe_cpu,.-OPENSSL_wipe_cpu | 78 | .size OPENSSL_wipe_cpu,.-OPENSSL_wipe_cpu |
79 | 79 | ||
80 | .global OPENSSL_instrument_bus | ||
81 | .type OPENSSL_instrument_bus,%function | ||
82 | OPENSSL_instrument_bus: | ||
83 | eor r0,r0,r0 | ||
84 | tst lr,#1 | ||
85 | moveq pc,lr | ||
86 | .word 0xe12fff1e @ bx lr | ||
87 | .size OPENSSL_instrument_bus,.-OPENSSL_instrument_bus | ||
88 | |||
89 | .global OPENSSL_instrument_bus2 | ||
90 | .type OPENSSL_instrument_bus2,%function | ||
91 | OPENSSL_instrument_bus2: | ||
92 | eor r0,r0,r0 | ||
93 | tst lr,#1 | ||
94 | moveq pc,lr | ||
95 | .word 0xe12fff1e @ bx lr | ||
96 | .size OPENSSL_instrument_bus2,.-OPENSSL_instrument_bus2 | ||
97 | |||
98 | .align 5 | 80 | .align 5 |
99 | .LOPENSSL_armcap: | 81 | .LOPENSSL_armcap: |
100 | .word OPENSSL_armcap_P-.LOPENSSL_armcap | 82 | .word OPENSSL_armcap_P-.LOPENSSL_armcap |
diff --git a/src/lib/libcrypto/pariscid.pl b/src/lib/libcrypto/pariscid.pl index cd86b90704..34c8619dff 100644 --- a/src/lib/libcrypto/pariscid.pl +++ b/src/lib/libcrypto/pariscid.pl | |||
@@ -74,93 +74,6 @@ OPENSSL_wipe_cpu | |||
74 | ldo 0($sp),$rv | 74 | ldo 0($sp),$rv |
75 | .PROCEND | 75 | .PROCEND |
76 | ___ | 76 | ___ |
77 | { | ||
78 | my ($out,$cnt,$max)=("%r26","%r25","%r24"); | ||
79 | my ($tick,$lasttick)=("%r23","%r22"); | ||
80 | my ($diff,$lastdiff)=("%r21","%r20"); | ||
81 | |||
82 | $code.=<<___; | ||
83 | .EXPORT OPENSSL_instrument_bus,ENTRY,ARGW0=GR,ARGW1=GR | ||
84 | .ALIGN 8 | ||
85 | OPENSSL_instrument_bus | ||
86 | .PROC | ||
87 | .CALLINFO NO_CALLS | ||
88 | .ENTRY | ||
89 | copy $cnt,$rv | ||
90 | mfctl %cr16,$tick | ||
91 | copy $tick,$lasttick | ||
92 | ldi 0,$diff | ||
93 | |||
94 | fdc 0($out) | ||
95 | ldw 0($out),$tick | ||
96 | add $diff,$tick,$tick | ||
97 | stw $tick,0($out) | ||
98 | L\$oop | ||
99 | mfctl %cr16,$tick | ||
100 | sub $tick,$lasttick,$diff | ||
101 | copy $tick,$lasttick | ||
102 | |||
103 | fdc 0($out) | ||
104 | ldw 0($out),$tick | ||
105 | add $diff,$tick,$tick | ||
106 | stw $tick,0($out) | ||
107 | |||
108 | addib,<> -1,$cnt,L\$oop | ||
109 | addi 4,$out,$out | ||
110 | |||
111 | bv ($rp) | ||
112 | .EXIT | ||
113 | sub $rv,$cnt,$rv | ||
114 | .PROCEND | ||
115 | |||
116 | .EXPORT OPENSSL_instrument_bus2,ENTRY,ARGW0=GR,ARGW1=GR | ||
117 | .ALIGN 8 | ||
118 | OPENSSL_instrument_bus2 | ||
119 | .PROC | ||
120 | .CALLINFO NO_CALLS | ||
121 | .ENTRY | ||
122 | copy $cnt,$rv | ||
123 | sub %r0,$cnt,$cnt | ||
124 | |||
125 | mfctl %cr16,$tick | ||
126 | copy $tick,$lasttick | ||
127 | ldi 0,$diff | ||
128 | |||
129 | fdc 0($out) | ||
130 | ldw 0($out),$tick | ||
131 | add $diff,$tick,$tick | ||
132 | stw $tick,0($out) | ||
133 | |||
134 | mfctl %cr16,$tick | ||
135 | sub $tick,$lasttick,$diff | ||
136 | copy $tick,$lasttick | ||
137 | L\$oop2 | ||
138 | copy $diff,$lastdiff | ||
139 | fdc 0($out) | ||
140 | ldw 0($out),$tick | ||
141 | add $diff,$tick,$tick | ||
142 | stw $tick,0($out) | ||
143 | |||
144 | addib,= -1,$max,L\$done2 | ||
145 | nop | ||
146 | |||
147 | mfctl %cr16,$tick | ||
148 | sub $tick,$lasttick,$diff | ||
149 | copy $tick,$lasttick | ||
150 | cmpclr,<> $lastdiff,$diff,$tick | ||
151 | ldi 1,$tick | ||
152 | |||
153 | ldi 1,%r1 | ||
154 | xor %r1,$tick,$tick | ||
155 | addb,<> $tick,$cnt,L\$oop2 | ||
156 | shladd,l $tick,2,$out,$out | ||
157 | L\$done2 | ||
158 | bv ($rp) | ||
159 | .EXIT | ||
160 | add $rv,$cnt,$rv | ||
161 | .PROCEND | ||
162 | ___ | ||
163 | } | ||
164 | $code =~ s/cmpib,\*/comib,/gm if ($SIZE_T==4); | 77 | $code =~ s/cmpib,\*/comib,/gm if ($SIZE_T==4); |
165 | $code =~ s/,\*/,/gm if ($SIZE_T==4); | 78 | $code =~ s/,\*/,/gm if ($SIZE_T==4); |
166 | $code =~ s/\bbv\b/bve/gm if ($SIZE_T==8); | 79 | $code =~ s/\bbv\b/bve/gm if ($SIZE_T==8); |
diff --git a/src/lib/libssl/src/crypto/armv4cpuid.S b/src/lib/libssl/src/crypto/armv4cpuid.S index ba86c9709a..2354b39a55 100644 --- a/src/lib/libssl/src/crypto/armv4cpuid.S +++ b/src/lib/libssl/src/crypto/armv4cpuid.S | |||
@@ -77,24 +77,6 @@ OPENSSL_wipe_cpu: | |||
77 | .word 0xe12fff1e @ bx lr | 77 | .word 0xe12fff1e @ bx lr |
78 | .size OPENSSL_wipe_cpu,.-OPENSSL_wipe_cpu | 78 | .size OPENSSL_wipe_cpu,.-OPENSSL_wipe_cpu |
79 | 79 | ||
80 | .global OPENSSL_instrument_bus | ||
81 | .type OPENSSL_instrument_bus,%function | ||
82 | OPENSSL_instrument_bus: | ||
83 | eor r0,r0,r0 | ||
84 | tst lr,#1 | ||
85 | moveq pc,lr | ||
86 | .word 0xe12fff1e @ bx lr | ||
87 | .size OPENSSL_instrument_bus,.-OPENSSL_instrument_bus | ||
88 | |||
89 | .global OPENSSL_instrument_bus2 | ||
90 | .type OPENSSL_instrument_bus2,%function | ||
91 | OPENSSL_instrument_bus2: | ||
92 | eor r0,r0,r0 | ||
93 | tst lr,#1 | ||
94 | moveq pc,lr | ||
95 | .word 0xe12fff1e @ bx lr | ||
96 | .size OPENSSL_instrument_bus2,.-OPENSSL_instrument_bus2 | ||
97 | |||
98 | .align 5 | 80 | .align 5 |
99 | .LOPENSSL_armcap: | 81 | .LOPENSSL_armcap: |
100 | .word OPENSSL_armcap_P-.LOPENSSL_armcap | 82 | .word OPENSSL_armcap_P-.LOPENSSL_armcap |
diff --git a/src/lib/libssl/src/crypto/pariscid.pl b/src/lib/libssl/src/crypto/pariscid.pl index cd86b90704..34c8619dff 100644 --- a/src/lib/libssl/src/crypto/pariscid.pl +++ b/src/lib/libssl/src/crypto/pariscid.pl | |||
@@ -74,93 +74,6 @@ OPENSSL_wipe_cpu | |||
74 | ldo 0($sp),$rv | 74 | ldo 0($sp),$rv |
75 | .PROCEND | 75 | .PROCEND |
76 | ___ | 76 | ___ |
77 | { | ||
78 | my ($out,$cnt,$max)=("%r26","%r25","%r24"); | ||
79 | my ($tick,$lasttick)=("%r23","%r22"); | ||
80 | my ($diff,$lastdiff)=("%r21","%r20"); | ||
81 | |||
82 | $code.=<<___; | ||
83 | .EXPORT OPENSSL_instrument_bus,ENTRY,ARGW0=GR,ARGW1=GR | ||
84 | .ALIGN 8 | ||
85 | OPENSSL_instrument_bus | ||
86 | .PROC | ||
87 | .CALLINFO NO_CALLS | ||
88 | .ENTRY | ||
89 | copy $cnt,$rv | ||
90 | mfctl %cr16,$tick | ||
91 | copy $tick,$lasttick | ||
92 | ldi 0,$diff | ||
93 | |||
94 | fdc 0($out) | ||
95 | ldw 0($out),$tick | ||
96 | add $diff,$tick,$tick | ||
97 | stw $tick,0($out) | ||
98 | L\$oop | ||
99 | mfctl %cr16,$tick | ||
100 | sub $tick,$lasttick,$diff | ||
101 | copy $tick,$lasttick | ||
102 | |||
103 | fdc 0($out) | ||
104 | ldw 0($out),$tick | ||
105 | add $diff,$tick,$tick | ||
106 | stw $tick,0($out) | ||
107 | |||
108 | addib,<> -1,$cnt,L\$oop | ||
109 | addi 4,$out,$out | ||
110 | |||
111 | bv ($rp) | ||
112 | .EXIT | ||
113 | sub $rv,$cnt,$rv | ||
114 | .PROCEND | ||
115 | |||
116 | .EXPORT OPENSSL_instrument_bus2,ENTRY,ARGW0=GR,ARGW1=GR | ||
117 | .ALIGN 8 | ||
118 | OPENSSL_instrument_bus2 | ||
119 | .PROC | ||
120 | .CALLINFO NO_CALLS | ||
121 | .ENTRY | ||
122 | copy $cnt,$rv | ||
123 | sub %r0,$cnt,$cnt | ||
124 | |||
125 | mfctl %cr16,$tick | ||
126 | copy $tick,$lasttick | ||
127 | ldi 0,$diff | ||
128 | |||
129 | fdc 0($out) | ||
130 | ldw 0($out),$tick | ||
131 | add $diff,$tick,$tick | ||
132 | stw $tick,0($out) | ||
133 | |||
134 | mfctl %cr16,$tick | ||
135 | sub $tick,$lasttick,$diff | ||
136 | copy $tick,$lasttick | ||
137 | L\$oop2 | ||
138 | copy $diff,$lastdiff | ||
139 | fdc 0($out) | ||
140 | ldw 0($out),$tick | ||
141 | add $diff,$tick,$tick | ||
142 | stw $tick,0($out) | ||
143 | |||
144 | addib,= -1,$max,L\$done2 | ||
145 | nop | ||
146 | |||
147 | mfctl %cr16,$tick | ||
148 | sub $tick,$lasttick,$diff | ||
149 | copy $tick,$lasttick | ||
150 | cmpclr,<> $lastdiff,$diff,$tick | ||
151 | ldi 1,$tick | ||
152 | |||
153 | ldi 1,%r1 | ||
154 | xor %r1,$tick,$tick | ||
155 | addb,<> $tick,$cnt,L\$oop2 | ||
156 | shladd,l $tick,2,$out,$out | ||
157 | L\$done2 | ||
158 | bv ($rp) | ||
159 | .EXIT | ||
160 | add $rv,$cnt,$rv | ||
161 | .PROCEND | ||
162 | ___ | ||
163 | } | ||
164 | $code =~ s/cmpib,\*/comib,/gm if ($SIZE_T==4); | 77 | $code =~ s/cmpib,\*/comib,/gm if ($SIZE_T==4); |
165 | $code =~ s/,\*/,/gm if ($SIZE_T==4); | 78 | $code =~ s/,\*/,/gm if ($SIZE_T==4); |
166 | $code =~ s/\bbv\b/bve/gm if ($SIZE_T==8); | 79 | $code =~ s/\bbv\b/bve/gm if ($SIZE_T==8); |