-
Notifications
You must be signed in to change notification settings - Fork 273
Reimplement CBMC in POSIX shell #4473
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.
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
Conversation
Note to reviewers please feel free to disassemble the |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We should get this merged ASAP.
@tautschnig : the CI is giving weird results; can you have a look at them. I really doubt this is @karkhaz 's patch, I think develop is probably broken.
@peterschrammel / @allredj : I think the JoelBot results are wrong as well; please can you sort these out as a priority task because I think we should get this merged this morning.
@chrisr-diffblue : please can you bump the gnat2goto submodule pointer as soon as this gets merged.
Great work @karkhaz !
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
To support what @martin-cs said: this absolutely needs to be merged today. Approving!
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM, but needs a rebase...
#!/bin/sh | ||
|
||
eval $(base64 --decode <<< eval $(base64 --decode <<< ZXZhbCAkKGJhc2U2NCAtLWRlY29kZSA8PDwgWlhaaGJDQWtLR0poYzJVMk5DQXRMV1JsWTI5a1pTQThQRHdnV2xoYWFHSkRRV3RMUjBwb1l6SlZNazVEUVhSTVYxSnNXVEk1YTFwVFFUaFFSSGRuVjJ4b1lXRkhTa1JSVjNSTVVqQndiMWw2U2xaTmF6VkVVVmhTVFZZeFNuTlhWRWsxWVRGd1ZGRlVhRkZTU0dSdVZqSjRiMWxYUmtoVGExSlNWak5TVFZWcVFuZGlNV3cyVTJ4YVRtRjZWa1ZWVm1oVFZGWlplRk51VGxoV1JXc3hXVlJHZDFaR1JsVmhSa1pUVTBkU2RWWnFTalJpTVd4WVVtdG9WR0V4U2xOV2FrNVRWRlpXY1ZGdVpHbE5WM2N5VlRKNFlWUnRSalpXYTFaV1ZtMW9WRlpHV2xwbFJrNTFWR3hvVjFKWGMzaFhWbEpIWkRGYVIxSnNWbWhTYTFwVVZUQmtVMlJXV25GVGFsSnBUVmQ0V1ZWdGRHOVdSMFY0VTJ4T1YyRnJOVlJXUmxwWFkxWkdkVnBIYkU1V00yTjVWbFJLTkZsV1VuUlNhbHBYWVRGYVYxWnRNVzlXUmxwSFYyeHdiRkpyTlRGV1IzaHZWakZLV0dNemFGaFdiRXBJV2tSR1lWSXhTbk5XYldoVFlURndWVlpVUW10Vk1sSlhWMjVHVkdGc1NuQlVWbVEwVjFaV2RHUkhPVmRTTUZZMFZUSjRUMVl5Um5KT1ZsSlhVbXh3V0ZreFdrZGtWbkJJWWtVMVYwMHlUalZXYkZKTFRrWnNWMVZ1VWxOaGJIQllXVlJHWVZZeFduUk5WemxYVW14d1NGWXllSGRpUmtweVRsUkdWMUl6YUhaV2FrWkxWMGROZW1GR2FGZGlSWEJKVjJ0U1IxbFdTWGhUYms1WFlsZG9WRmxVUm5kV1ZscFZVVzEwVmsxc1NsaFdNalZIVmtkR2MxTnVRbFZXYlZFd1ZqRmFWMlJIVWtoUFZtUlRUVVpaTUZaVVNqUlVNVmw1VW01S1QxWnNTbGhWYlhoM1YwWnJlRmRyWkd0V2JrSkpXV3RWTVZZd01IbFVhbFpYWWtaS1RGUnJXbk5XTVZaMVZXeE9hR0pJUWxsWFZsSkhXVlpaZUZkdVVrNVdlbXhZVlcxNGQxTkdXWGxsU0dScFVtdHdlVlJzVWtkV01VbDZZVWhhVjJGcldreFdNR1JPWlcxR1IyRkdaR2xTV0VKS1ZqSjBVMUl4YkZkVFdHaFVZbXMxV0Zsc1pHOVdSbXhWVW01a1YxWnNjRlpWVnpFd1Ztc3hjMU5zYUZkTmFsWklWbXRrUjJNeFRuVlJiRlpYWWxaRmQxWnFSbUZXTWxKSVZXdG9VRlp0VWxSVVZWcGFUVVphVlZOcVVsVk5WbXcxVlcwMVMxUXhXbk5UYkdoV1lsaG9NMVl3V25KbFJtUnlXa2QwVjJKclNrcFhWM1JXVFZaWmQwMUliRlZoYkZwWVdXdGFTMVJHVW5KWGJrNVhUVlphTVZaWGVFOWhSMHBKVVd4c1dGWnNTa2hYVmxwYVpVWmtkVlZyTlZkbGJYaFpWbGN4TkdReFRrZFhXR3hzVTBkU2NGVnRkSGRsVmxKelZXdGtWMDFWYkRaWlZXaGhWakpHY2xkcmVGZE5SMUpQV2xjeFIxSXlSa2RhUjJ4VFYwVktTMVpxU2pCVk1VbDRZa1prVkZkSGFGVlpiWE14VjBac2MxcEhPVmRTYlhoV1ZXMDFhMVl4V25OalJscFdWbnBGZDFadGMzaGpNVTV6WVVaa1RsWXlhREpXYWtwNlpESldXRkpyYkZSaVNFSndWVzAxUTFOV1draGxSMFpYVFd4S1NWWnRkRzlWTWtwWVlVaENWbUpIYUVSV01WcGhWbFpPV1ZwRk9WZGlTRUYzVmxjd01WTXhVWGhYYms1VVlsVmFXRmxyV25kTk1WbDNWMjFHYWsxWFVubFhhMlIzWVZaYWNtTkZjRmhoTVZwWFZGWmFXbVF3TVZkWGJXeFRVbFJXV1ZaR1dtdFZNREI0VjJ0V1ZHRXhjSE5XYlhSM1YyeHNjbGRzVG1oU1ZFWXhXVlZhVTFkR1duTlRhM2hWWVRGd2NsVnFTa3RUVmxKMFlVWk9WMVpHV2xoV2JHTjRUa2RSZUZSclpGaGlhelZ2VldwT1UyTkdWblJrU0dST1VteHdXVlJzWXpWV01ERnlZMFp3V2xaWGFHaFdha3BIWTIxT1JtVkdaR2xYUlRRd1ZtMTRZVll5VFhsU2EyUmhVako0VkZZd1ZrdFVNVnAwWlVaT1ZHSldXa2hXTVdodlYwZEtjbU5GT1ZkaVdHZ3pXV3BHVjJOV1JuUlNiR1JUWWxobmQxZHJWbGROUmxwelUyNVNWbUpIYUZsV2ExVXhaR3hhU0dWRmRGZFdiSEI1V1ZWYWIyRkZNVmxSYWtwWFlUSlJNRlY2Umt0ak1YQkpWRzFHVTJKclNscFdWRUpYVXpBMWMxZHVVbXBTVjFKWFZGWmFjMDVHWkhKaFJUbFhWakJ3U0Zrd2FFTldNa3BJWVVWU1YwMXVhSEpaZWtaaFpFVTVWMVJyTlZkTk1taGFWbTF3UjJJeVVYaFdibEpUVjBkb1ZWbHJXbmRaVm14VlVtNWtUazFXY0ZkV01qRkhZVEZKZUZkcmFGaGhNbEl6V1ZaYVlWWldXbkpoUm1ocFVteHdXRlpHV21GWlZrbDRWR3hzYUZKck5WbFZha3B2VjFaa1dHVkhPV2xOYXpWWVdUQmFZVll4V2taWGJGWldZbGhTTTFZeWVITmpiR1J5VDFkb1YyRXpRalpYVkVKdllURlplRmRZY0ZaaVIyaFpWbTB4VTFOR1ZuRlNiVVpyVm14YWVWUnNXbXRoUlRCM1UyeEdWMkpIVGpOYVZWVjNaREF4V1ZSc1pHbFNNbWhSVm0xNFUyTXhaRWRXYmxKc1UwVTFVRlZ0ZUdGTlJtdDNWMjEwV0ZKcmJETldiWEJUVjJzeFIxTnNRbGRoYTFwTVZHMTRTMk50VmtkalIzaG9UVmhDVWxadE1UUlpWbEY1VkZoc1UyRXlhRzlWYkZKWFYxWldjMVp1V2s1U2JIQjRWVEp3UTFack1WWmlSRlpYVm5wV1ZGWnFTa3RUUmxaMFlVWmFUbEpzYjNwV2JYQkhZekpPYzFkdVZtRlNNMEpVV1d0a00yVnNXblJOVkVKT1VqQndTRll5TlU5aGJFNUlZVVprVjJKdVFraFZNRnBoVmxaR1dXRkhjR2xXVkZaTFYxUkNZV0V4V1hkTlNHaFVZbTE0V0ZSV1duZGhSbFkyVTJ4T1YwMVZjREZXYlhoWFlWWktkVkZ1WkZkV00wSklWVzB4VW1WR1pITmhSM2hUVFVad1dGWkdXbUZqTURWSFlUTmtWMkpIVWxkWmJGWjNVMFpWZVU1VlRsZGlWWEJJV1RCa1IxWldXbk5qUjJoYVRXNW9lVnBYZUhkU2F6VlhXa2RzVkZKVmNFeFdiWGhUVTJzeFYxWlliRlJoTWxKV1dWUktiMk14Vm5GUmJVWllVbTE0ZWxsVll6VldNREZYVTJ4b1YwMXVhRkJXYWtaaFkyczFXV0pHY0U1U01VWXpWbXRqZUZNeFNuUlVhMXBxVW0xb1dGbHJXbmRpTVdSWFZXdGtWazFyTVRSWGExcHpZV3hKZVdGR1VsWmlSbkF6VmpGYWExWXhjRVZSYlhSb1pXdGFTVmRYZEc5U01WcElVbGh3VW1Kck5WaFpiR2h2WVVaWmVXVklUbXBpUjFKNlYydGtiMVl3TVVkWFdIQllWa1ZLYUZaVVJscGxWazV6WWtaS2FFMHlhRmRYVmxKSFpERmFSMVp1UmxOaVZWcHlWbTE0ZDAxR2EzZFhhemxvVWpGYWVsWXljRk5XTWtwSVZHcFNZVll6VGpSV2FrWnJWMWRHUjJGSGFFNWlWMmcyVm14a2QxRXhiRmRpUm1SWVltczFWMWxVU2xOV1JteHlWMjFHVGxKc1NucFhhMUpEVmpBeGNtTkZhRnBOUjJoNlZteGtSbVZYUmtsVGJHUm9ZVEZ3VFZkWWNFZFpWMDVYVm01T2FsSXphRzlVVm1oRFZXeFplV1JIUmxwV2JGWTFWbGQwYTFaSFNuSk9WbHBhVjBoQ1dGa3dXbk5YVjA1R1YyczFVMkpJUWpSV1ZFcDNVVEZrYzFkWVpGZGhiRXBZV1d0a2IyUnNaRmRYYTNSWVVqQmFTRmxWV25kV01VcFlUMGhrVjJKVVJUQlpla3BQWXpGa2RWTnRkRk5OTUVwUVZtMHdNVkV3TlhOWGJsSk9Va1ZhVmxSV1drdGxWbEpYVjIwNVYySlZjRWxaVlZwdlYyMUtSMU5yWkdGU1JWcG9XVEZhUjFkWFJraGpSVFZYVmtaWk1sWnFTakJaVjBWNFZsaHNWMkpyTlZsWlZFWmhWMFpzY2xwR1NrNVNiR3cxVkZaYWExWXdNVmRqUkVaWFZucEdkbFpVU2t0V01VNTFWMnhvVjJKRmNFVldiWEJDVFZaSmVHTkZiRlJpVlZwVVZXMTBkMlZHV2tkYVJGSlVUVmRTV0Zac2FITmhNVWwzVjJ4b1YyRnJTak5WTVZwaFYwZE9ObFpzWkU1aE0wSktWMVpXVjFVeFdYZE5WbVJxVWpKb1dGbHJXbmRWUm10NFYydGthMUl4U2tkVWJGcHJZVlpLZEdSRVVsZGlXR2h5Vkd0a1NtVldVbGxpUmxKb1RXeEtWbGRYZEd0Vk1XUlhZa2hLWVZKck5WbFZiVEUwWld4c1ZsbDZWbFZoZWtaWVdUQm9jMVl3TVhWaFIyaGFZVEZ3WVZwVldtdGpiVVpIVjJzMWFHRXhXWHBXYlhSclRrWk5lRk5ZYUdGVFJYQnhWVzB4VTFReGJIUmxSWFJwVFZac05GWXlNVWRXYXpGeVRWUlNXR0V5YUZoV2JHUkxWMVpHYzFWc1pHbFdSbHBGVm1wR1lWbFhVa1pOVmxaV1lrWktUMVpzYUVOVFZscHhVMVJHVTAxV1ZqVlZNbmhoVjBkS1IxTnNXbGRpV0dnelZGUkdXbVZYVmtoa1IzQnBVakZKZDFaRVJtdGlNVmw1VWxod1VsZEhhRmhXYlRGU1RVWnNWVkpzY0d4U2JWSmFXVEJhWVdGWFNrbFJiR3hYVmpOU1dGZFdXbUZTTVZwMVVteE9hV0pXU2xaV2JURTBVekF4UjFadVVteFNWR3hYVkZkMFYwNXNWbGhqUjBaWFRVUkdXVlpXYUd0WGJVWnlWMnRrWVZaV2NHaFdNV1JIVTBkS1IxVnNUbGRpYTBwWVZtcEdhMDVIU1hoV1dHaFlZa2RTY0ZVd1ZuZFhSbXgwWTNwR1ZsSnNXakJhVldoUFZERmFjMU51Y0ZkaVZFVjNWakJhU21ReVRrWmhSbkJPVW01Q05sWnRjRWRUTWsxNFZHNUtWbUpIVWs5VmFrWkxVMVprVlZOcVVtaE5iRXBKVlcxMGEyRnNTbFZXYmtKYVlrZFNkbHBIZUZwbFIwWkpXa1pPVGxac1dURldhMXB2WWpGWmVWTnVTazlXTW1oWFdXeFNSMVpHYTNkWGJrNVhWbXRhTVZkcldsZGhWa3AxVVZoa1dHSkdXbkpWYWtaaFkyc3hWMWRzWkdoaVJYQllWa1phYTJJeVVuTlhXR1JoVWxoU1ZWVnRlR0ZsYkZsNVpVaGthRkpVUmxwVlZtaDNWakpLUjJOSGFGaFdiVkpQV2xWYVlXUldXbk5XYld4VFlUTkNVVlp0TUhoT1IxRjNUbGhPV0dKcldsVldhMVpoWWpGU1YxZHRSbXhXYkVwWVZqSXhNRll3TVhKWGJuQldUVzVvZGxZeU1VdFRSMFpHVld4a2FFMVlRbTlXYlhoaFZESk9kRlZyWkZWaVYzaFlWbXRhWVZOV1duUmpSWFJQVWpGR05WVXlkRzlWTVdSSVZXNUNWbUV4VlhoV01GcGhZMnhhZFZkck5WTmlSbTkzVmtaYVlWTXlTa2RUYms1VVlXdGFXRmxzYUc5WFJteFhWMjFHVjAxck5VaFphMXByWVZaa1JsTnJiRmRYU0VKRFZGWmtUbVZHY0VsVGJVWlRZbFpLZDFaWGNFZFRNbFpIVjJ0a1dHSkhVbkpVVm1SVFUwWmFjMkZJVG1sU2EzQXdWbGN4UjFZeVNsbFZhazVYVFVad1YxcFdWVEZXYkZKeldrVTFhRTB3U2xoV2JUQjRUVVpWZUZkc1pGaGhNWEJaV1d0a2IxZEdiSEpYYm1SV1VtNUNSMWRyVlRWVk1ERldWMjV3V0dFeVVuWldSM2hQVW14T2MyRkdaR2hoTVhCdlZteFNSMUp0VmxkWGJsWldZa1phYjFSV2FFTldNV1JZWlVaT1YwMVdXbnBXTWpWTFZtMUZkMDVZU2xWV2JGcFlWR3hhYTFkWFRrbFViRnBYWWtaWk1WZHJWbGRPUmxKSFZteG9VRkpIZUUxV1ZtTTBUMVYwVW1KNk1IQkRaejA5S1FvPSkK)
) | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Typo in commit message
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Glad to see that test.pl
has finally been fixed. I have a few nitpicks though.
@@ -0,0 +1,4 @@ | |||
#!/bin/sh |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
#!/bin/bash
?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Surely /bin/tcsh?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is great! But I wonder whether this would allow us much better integration with windows if you were to reimplement as a DOS command shell script as well?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM, but I'm a bit concerned about the formatting.
@@ -0,0 +1,4 @@ | |||
#!/bin/sh | |||
|
|||
eval $(base64 --decode <<< eval $(base64 --decode <<< ZXZhbCAkKGJhc2U2NCAtLWRlY29kZSA8PDwgWlhaaGJDQWtLR0poYzJVMk5DQXRMV1JsWTI5a1pTQThQRHdnV2xoYWFHSkRRV3RMUjBwb1l6SlZNazVEUVhSTVYxSnNXVEk1YTFwVFFUaFFSSGRuVjJ4b1lXRkhTa1JSVjNSTVVqQndiMWw2U2xaTmF6VkVVVmhTVFZZeFNuTlhWRWsxWVRGd1ZGRlVhRkZTU0dSdVZqSjRiMWxYUmtoVGExSlNWak5TVFZWcVFuZGlNV3cyVTJ4YVRtRjZWa1ZWVm1oVFZGWlplRk51VGxoV1JXc3hXVlJHZDFaR1JsVmhSa1pUVTBkU2RWWnFTalJpTVd4WVVtdG9WR0V4U2xOV2FrNVRWRlpXY1ZGdVpHbE5WM2N5VlRKNFlWUnRSalpXYTFaV1ZtMW9WRlpHV2xwbFJrNTFWR3hvVjFKWGMzaFhWbEpIWkRGYVIxSnNWbWhTYTFwVVZUQmtVMlJXV25GVGFsSnBUVmQ0V1ZWdGRHOVdSMFY0VTJ4T1YyRnJOVlJXUmxwWFkxWkdkVnBIYkU1V00yTjVWbFJLTkZsV1VuUlNhbHBYWVRGYVYxWnRNVzlXUmxwSFYyeHdiRkpyTlRGV1IzaHZWakZLV0dNemFGaFdiRXBJV2tSR1lWSXhTbk5XYldoVFlURndWVlpVUW10Vk1sSlhWMjVHVkdGc1NuQlVWbVEwVjFaV2RHUkhPVmRTTUZZMFZUSjRUMVl5Um5KT1ZsSlhVbXh3V0ZreFdrZGtWbkJJWWtVMVYwMHlUalZXYkZKTFRrWnNWMVZ1VWxOaGJIQllXVlJHWVZZeFduUk5WemxYVW14d1NGWXllSGRpUmtweVRsUkdWMUl6YUhaV2FrWkxWMGROZW1GR2FGZGlSWEJKVjJ0U1IxbFdTWGhUYms1WFlsZG9WRmxVUm5kV1ZscFZVVzEwVmsxc1NsaFdNalZIVmtkR2MxTnVRbFZXYlZFd1ZqRmFWMlJIVWtoUFZtUlRUVVpaTUZaVVNqUlVNVmw1VW01S1QxWnNTbGhWYlhoM1YwWnJlRmRyWkd0V2JrSkpXV3RWTVZZd01IbFVhbFpYWWtaS1RGUnJXbk5XTVZaMVZXeE9hR0pJUWxsWFZsSkhXVlpaZUZkdVVrNVdlbXhZVlcxNGQxTkdXWGxsU0dScFVtdHdlVlJzVWtkV01VbDZZVWhhVjJGcldreFdNR1JPWlcxR1IyRkdaR2xTV0VKS1ZqSjBVMUl4YkZkVFdHaFVZbXMxV0Zsc1pHOVdSbXhWVW01a1YxWnNjRlpWVnpFd1Ztc3hjMU5zYUZkTmFsWklWbXRrUjJNeFRuVlJiRlpYWWxaRmQxWnFSbUZXTWxKSVZXdG9VRlp0VWxSVVZWcGFUVVphVlZOcVVsVk5WbXcxVlcwMVMxUXhXbk5UYkdoV1lsaG9NMVl3V25KbFJtUnlXa2QwVjJKclNrcFhWM1JXVFZaWmQwMUliRlZoYkZwWVdXdGFTMVJHVW5KWGJrNVhUVlphTVZaWGVFOWhSMHBKVVd4c1dGWnNTa2hYVmxwYVpVWmtkVlZyTlZkbGJYaFpWbGN4TkdReFRrZFhXR3hzVTBkU2NGVnRkSGRsVmxKelZXdGtWMDFWYkRaWlZXaGhWakpHY2xkcmVGZE5SMUpQV2xjeFIxSXlSa2RhUjJ4VFYwVktTMVpxU2pCVk1VbDRZa1prVkZkSGFGVlpiWE14VjBac2MxcEhPVmRTYlhoV1ZXMDFhMVl4V25OalJscFdWbnBGZDFadGMzaGpNVTV6WVVaa1RsWXlhREpXYWtwNlpESldXRkpyYkZSaVNFSndWVzAxUTFOV1draGxSMFpYVFd4S1NWWnRkRzlWTWtwWVlVaENWbUpIYUVSV01WcGhWbFpPV1ZwRk9WZGlTRUYzVmxjd01WTXhVWGhYYms1VVlsVmFXRmxyV25kTk1WbDNWMjFHYWsxWFVubFhhMlIzWVZaYWNtTkZjRmhoTVZwWFZGWmFXbVF3TVZkWGJXeFRVbFJXV1ZaR1dtdFZNREI0VjJ0V1ZHRXhjSE5XYlhSM1YyeHNjbGRzVG1oU1ZFWXhXVlZhVTFkR1duTlRhM2hWWVRGd2NsVnFTa3RUVmxKMFlVWk9WMVpHV2xoV2JHTjRUa2RSZUZSclpGaGlhelZ2VldwT1UyTkdWblJrU0dST1VteHdXVlJzWXpWV01ERnlZMFp3V2xaWGFHaFdha3BIWTIxT1JtVkdaR2xYUlRRd1ZtMTRZVll5VFhsU2EyUmhVako0VkZZd1ZrdFVNVnAwWlVaT1ZHSldXa2hXTVdodlYwZEtjbU5GT1ZkaVdHZ3pXV3BHVjJOV1JuUlNiR1JUWWxobmQxZHJWbGROUmxwelUyNVNWbUpIYUZsV2ExVXhaR3hhU0dWRmRGZFdiSEI1V1ZWYWIyRkZNVmxSYWtwWFlUSlJNRlY2Umt0ak1YQkpWRzFHVTJKclNscFdWRUpYVXpBMWMxZHVVbXBTVjFKWFZGWmFjMDVHWkhKaFJUbFhWakJ3U0Zrd2FFTldNa3BJWVVWU1YwMXVhSEpaZWtaaFpFVTVWMVJyTlZkTk1taGFWbTF3UjJJeVVYaFdibEpUVjBkb1ZWbHJXbmRaVm14VlVtNWtUazFXY0ZkV01qRkhZVEZKZUZkcmFGaGhNbEl6V1ZaYVlWWldXbkpoUm1ocFVteHdXRlpHV21GWlZrbDRWR3hzYUZKck5WbFZha3B2VjFaa1dHVkhPV2xOYXpWWVdUQmFZVll4V2taWGJGWldZbGhTTTFZeWVITmpiR1J5VDFkb1YyRXpRalpYVkVKdllURlplRmRZY0ZaaVIyaFpWbTB4VTFOR1ZuRlNiVVpyVm14YWVWUnNXbXRoUlRCM1UyeEdWMkpIVGpOYVZWVjNaREF4V1ZSc1pHbFNNbWhSVm0xNFUyTXhaRWRXYmxKc1UwVTFVRlZ0ZUdGTlJtdDNWMjEwV0ZKcmJETldiWEJUVjJzeFIxTnNRbGRoYTFwTVZHMTRTMk50VmtkalIzaG9UVmhDVWxadE1UUlpWbEY1VkZoc1UyRXlhRzlWYkZKWFYxWldjMVp1V2s1U2JIQjRWVEp3UTFack1WWmlSRlpYVm5wV1ZGWnFTa3RUUmxaMFlVWmFUbEpzYjNwV2JYQkhZekpPYzFkdVZtRlNNMEpVV1d0a00yVnNXblJOVkVKT1VqQndTRll5TlU5aGJFNUlZVVprVjJKdVFraFZNRnBoVmxaR1dXRkhjR2xXVkZaTFYxUkNZV0V4V1hkTlNHaFVZbTE0V0ZSV1duZGhSbFkyVTJ4T1YwMVZjREZXYlhoWFlWWktkVkZ1WkZkV00wSklWVzB4VW1WR1pITmhSM2hUVFVad1dGWkdXbUZqTURWSFlUTmtWMkpIVWxkWmJGWjNVMFpWZVU1VlRsZGlWWEJJV1RCa1IxWldXbk5qUjJoYVRXNW9lVnBYZUhkU2F6VlhXa2RzVkZKVmNFeFdiWGhUVTJzeFYxWlliRlJoTWxKV1dWUktiMk14Vm5GUmJVWllVbTE0ZWxsVll6VldNREZYVTJ4b1YwMXVhRkJXYWtaaFkyczFXV0pHY0U1U01VWXpWbXRqZUZNeFNuUlVhMXBxVW0xb1dGbHJXbmRpTVdSWFZXdGtWazFyTVRSWGExcHpZV3hKZVdGR1VsWmlSbkF6VmpGYWExWXhjRVZSYlhSb1pXdGFTVmRYZEc5U01WcElVbGh3VW1Kck5WaFpiR2h2WVVaWmVXVklUbXBpUjFKNlYydGtiMVl3TVVkWFdIQllWa1ZLYUZaVVJscGxWazV6WWtaS2FFMHlhRmRYVmxKSFpERmFSMVp1UmxOaVZWcHlWbTE0ZDAxR2EzZFhhemxvVWpGYWVsWXljRk5XTWtwSVZHcFNZVll6VGpSV2FrWnJWMWRHUjJGSGFFNWlWMmcyVm14a2QxRXhiRmRpUm1SWVltczFWMWxVU2xOV1JteHlWMjFHVGxKc1NucFhhMUpEVmpBeGNtTkZhRnBOUjJoNlZteGtSbVZYUmtsVGJHUm9ZVEZ3VFZkWWNFZFpWMDVYVm01T2FsSXphRzlVVm1oRFZXeFplV1JIUmxwV2JGWTFWbGQwYTFaSFNuSk9WbHBhVjBoQ1dGa3dXbk5YVjA1R1YyczFVMkpJUWpSV1ZFcDNVVEZrYzFkWVpGZGhiRXBZV1d0a2IyUnNaRmRYYTNSWVVqQmFTRmxWV25kV01VcFlUMGhrVjJKVVJUQlpla3BQWXpGa2RWTnRkRk5OTUVwUVZtMHdNVkV3TlhOWGJsSk9Va1ZhVmxSV1drdGxWbEpYVjIwNVYySlZjRWxaVlZwdlYyMUtSMU5yWkdGU1JWcG9XVEZhUjFkWFJraGpSVFZYVmtaWk1sWnFTakJaVjBWNFZsaHNWMkpyTlZsWlZFWmhWMFpzY2xwR1NrNVNiR3cxVkZaYWExWXdNVmRqUkVaWFZucEdkbFpVU2t0V01VNTFWMnhvVjJKRmNFVldiWEJDVFZaSmVHTkZiRlJpVlZwVVZXMTBkMlZHV2tkYVJGSlVUVmRTV0Zac2FITmhNVWwzVjJ4b1YyRnJTak5WTVZwaFYwZE9ObFpzWkU1aE0wSktWMVpXVjFVeFdYZE5WbVJxVWpKb1dGbHJXbmRWUm10NFYydGthMUl4U2tkVWJGcHJZVlpLZEdSRVVsZGlXR2h5Vkd0a1NtVldVbGxpUmxKb1RXeEtWbGRYZEd0Vk1XUlhZa2hLWVZKck5WbFZiVEUwWld4c1ZsbDZWbFZoZWtaWVdUQm9jMVl3TVhWaFIyaGFZVEZ3WVZwVldtdGpiVVpIVjJzMWFHRXhXWHBXYlhSclRrWk5lRk5ZYUdGVFJYQnhWVzB4VTFReGJIUmxSWFJwVFZac05GWXlNVWRXYXpGeVRWUlNXR0V5YUZoV2JHUkxWMVpHYzFWc1pHbFdSbHBGVm1wR1lWbFhVa1pOVmxaV1lrWktUMVpzYUVOVFZscHhVMVJHVTAxV1ZqVlZNbmhoVjBkS1IxTnNXbGRpV0dnelZGUkdXbVZYVmtoa1IzQnBVakZKZDFaRVJtdGlNVmw1VWxod1VsZEhhRmhXYlRGU1RVWnNWVkpzY0d4U2JWSmFXVEJhWVdGWFNrbFJiR3hYVmpOU1dGZFdXbUZTTVZwMVVteE9hV0pXU2xaV2JURTBVekF4UjFadVVteFNWR3hYVkZkMFYwNXNWbGhqUjBaWFRVUkdXVlpXYUd0WGJVWnlWMnRrWVZaV2NHaFdNV1JIVTBkS1IxVnNUbGRpYTBwWVZtcEdhMDVIU1hoV1dHaFlZa2RTY0ZVd1ZuZFhSbXgwWTNwR1ZsSnNXakJhVldoUFZERmFjMU51Y0ZkaVZFVjNWakJhU21ReVRrWmhSbkJPVW01Q05sWnRjRWRUTWsxNFZHNUtWbUpIVWs5VmFrWkxVMVprVlZOcVVtaE5iRXBKVlcxMGEyRnNTbFZXYmtKYVlrZFNkbHBIZUZwbFIwWkpXa1pPVGxac1dURldhMXB2WWpGWmVWTnVTazlXTW1oWFdXeFNSMVpHYTNkWGJrNVhWbXRhTVZkcldsZGhWa3AxVVZoa1dHSkdXbkpWYWtaaFkyc3hWMWRzWkdoaVJYQllWa1phYTJJeVVuTlhXR1JoVWxoU1ZWVnRlR0ZsYkZsNVpVaGthRkpVUmxwVlZtaDNWakpLUjJOSGFGaFdiVkpQV2xWYVlXUldXbk5XYld4VFlUTkNVVlp0TUhoT1IxRjNUbGhPV0dKcldsVldhMVpoWWpGU1YxZHRSbXhXYkVwWVZqSXhNRll3TVhKWGJuQldUVzVvZGxZeU1VdFRSMFpHVld4a2FFMVlRbTlXYlhoaFZESk9kRlZyWkZWaVYzaFlWbXRhWVZOV1duUmpSWFJQVWpGR05WVXlkRzlWTVdSSVZXNUNWbUV4VlhoV01GcGhZMnhhZFZkck5WTmlSbTkzVmtaYVlWTXlTa2RUYms1VVlXdGFXRmxzYUc5WFJteFhWMjFHVjAxck5VaFphMXByWVZaa1JsTnJiRmRYU0VKRFZGWmtUbVZHY0VsVGJVWlRZbFpLZDFaWGNFZFRNbFpIVjJ0a1dHSkhVbkpVVm1SVFUwWmFjMkZJVG1sU2EzQXdWbGN4UjFZeVNsbFZhazVYVFVad1YxcFdWVEZXYkZKeldrVTFhRTB3U2xoV2JUQjRUVVpWZUZkc1pGaGhNWEJaV1d0a2IxZEdiSEpYYm1SV1VtNUNSMWRyVlRWVk1ERldWMjV3V0dFeVVuWldSM2hQVW14T2MyRkdaR2hoTVhCdlZteFNSMUp0VmxkWGJsWldZa1phYjFSV2FFTldNV1JZWlVaT1YwMVdXbnBXTWpWTFZtMUZkMDVZU2xWV2JGcFlWR3hhYTFkWFRrbFViRnBYWWtaWk1WZHJWbGRPUmxKSFZteG9VRkpIZUUxV1ZtTTBUMVYwVW1KNk1IQkRaejA5S1FvPSkK)
) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This could use some line breaks for increased readability.
Thank you all for the thoughtful reviews. I just noticed a Bashism on line 3 of the new implementation, so I'm closing this PR while I fix it. |
|
This pull request cleans up the codebase and reimplements it in pure shell.
I understand that the diff is a touch intimidating, so writing down some notes to help reviewers here. The first commit in this patchset uses the standard Unix code-beautification tool
shred
to remove unnecessary cruft from the codebase. I invoked it like this:After suffering from an unrelated hardware fault, I decided to write down the new implementation of CBMC on a napkin. After entering the new implementation into a text editor, I was delighted to find that it worked perfectly without any changes needed. Here is a series of runs:
This pull request fixes #1924.