Skip to content

Commit bc7c2da

Browse files
authored
Update CBMC symlinks and makefile paths. (FreeRTOS#4)
1 parent 4a9a7a4 commit bc7c2da

File tree

44 files changed

+102
-120
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+102
-120
lines changed

cbmc/.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ TAGS-*
99

1010
# Emitted by Arpa
1111
arpa_cmake/
12+
arpa-validation-logs/
1213
Makefile.arpa
1314

1415
# These files should be overwritten whenever prepare.py runs

cbmc/include/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
../../../../../tools/aws-templates-for-cbmc-proofs/template-for-repository/include/README.md
1+
../aws-templates-for-cbmc-proofs/template-for-repository/include/README.md

cbmc/include/http_config.h

+1-25
Original file line numberDiff line numberDiff line change
@@ -22,30 +22,6 @@
2222
#ifndef HTTP_CONFIG_H
2323
#define HTTP_CONFIG_H
2424

25-
/**************************************************/
26-
/******* DO NOT CHANGE the following order ********/
27-
/**************************************************/
28-
29-
/* Include logging header files and define logging macros in the following order:
30-
* 1. Include the header file "logging_levels.h".
31-
* 2. Define the LIBRARY_LOG_NAME and LIBRARY_LOG_LEVEL macros depending on
32-
* the logging configuration for HTTP.
33-
* 3. Include the header file "logging_stack.h", if logging is enabled for HTTP.
34-
*/
35-
36-
#include "logging_levels.h"
37-
38-
/* Logging configuration for the HTTP library. */
39-
#ifndef LIBRARY_LOG_NAME
40-
#define LIBRARY_LOG_NAME "HTTP"
41-
#endif
42-
43-
#ifndef LIBRARY_LOG_LEVEL
44-
#define LIBRARY_LOG_LEVEL LOG_NONE
45-
#endif
46-
47-
#include "logging_stack.h"
48-
49-
/************ End of logging configuration ****************/
25+
/* Empty configuration header simply for compilation. */
5026

5127
#endif /* ifndef HTTP_CONFIG_H */

cbmc/proofs/HTTPClient_AddHeader/Makefile

+3-3
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,9 @@ REMOVE_FUNCTION_BODY += memcpy
4343
UNWINDSET += strncmp.0:5
4444

4545
PROOF_SOURCES += $(PROOFDIR)/$(HARNESS_FILE).c
46-
PROOF_SOURCES += $(SRCDIR)/libraries/standard/http/cbmc/sources/http_cbmc_state.c
47-
PROOF_SOURCES += $(SRCDIR)/libraries/standard/http/cbmc/stubs/memcpy.c
46+
PROOF_SOURCES += $(SRCDIR)/cbmc/sources/http_cbmc_state.c
47+
PROOF_SOURCES += $(SRCDIR)/cbmc/stubs/memcpy.c
4848

49-
PROJECT_SOURCES += $(SRCDIR)/libraries/standard/http/src/http_client.c
49+
PROJECT_SOURCES += $(SRCDIR)/source/http_client.c
5050

5151
include ../Makefile.common

cbmc/proofs/HTTPClient_AddHeader/cbmc-viewer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@
33

44
],
55
"proof-name": "HTTPClient_AddHeader",
6-
"proof-root": "libraries/standard/http/cbmc/proofs"
6+
"proof-root": "cbmc/proofs"
77
}

cbmc/proofs/HTTPClient_AddRangeHeader/Makefile

+2-2
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ UNWINDSET += __CPROVER_file_local_http_client_c_convertInt32ToAscii.0:11
3232
UNWINDSET += __CPROVER_file_local_http_client_c_convertInt32ToAscii.1:11
3333

3434
PROOF_SOURCES += $(PROOFDIR)/$(HARNESS_FILE).c
35-
PROOF_SOURCES += $(SRCDIR)/libraries/standard/http/cbmc/sources/http_cbmc_state.c
35+
PROOF_SOURCES += $(SRCDIR)/cbmc/sources/http_cbmc_state.c
3636

37-
PROJECT_SOURCES += $(SRCDIR)/libraries/standard/http/src/http_client.c
37+
PROJECT_SOURCES += $(SRCDIR)/source/http_client.c
3838

3939
include ../Makefile.common

cbmc/proofs/HTTPClient_AddRangeHeader/cbmc-viewer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@
33

44
],
55
"proof-name": "HTTPClient_AddRangeHeader",
6-
"proof-root": "libraries/standard/http/cbmc/proofs"
6+
"proof-root": "cbmc/proofs"
77
}

cbmc/proofs/HTTPClient_InitializeRequestHeaders/Makefile

+3-3
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,9 @@ REMOVE_FUNCTION_BODY += memcpy
4242
UNWINDSET += strncmp.0:5
4343

4444
PROOF_SOURCES += $(PROOFDIR)/$(HARNESS_FILE).c
45-
PROOF_SOURCES += $(SRCDIR)/libraries/standard/http/cbmc/sources/http_cbmc_state.c
46-
PROOF_SOURCES += $(SRCDIR)/libraries/standard/http/cbmc/stubs/memcpy.c
45+
PROOF_SOURCES += $(SRCDIR)/cbmc/sources/http_cbmc_state.c
46+
PROOF_SOURCES += $(SRCDIR)/cbmc/stubs/memcpy.c
4747

48-
PROJECT_SOURCES += $(SRCDIR)/libraries/standard/http/src/http_client.c
48+
PROJECT_SOURCES += $(SRCDIR)/source/http_client.c
4949

5050
include ../Makefile.common

cbmc/proofs/HTTPClient_InitializeRequestHeaders/cbmc-viewer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@
33

44
],
55
"proof-name": "HTTPClient_InitializeRequestHeaders",
6-
"proof-root": "libraries/standard/http/cbmc/proofs"
6+
"proof-root": "cbmc/proofs"
77
}

cbmc/proofs/HTTPClient_ReadHeader/Makefile

+3-3
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,10 @@ REMOVE_FUNCTION_BODY += http_parser_settings_init
3838
UNWINDSET +=
3939

4040
PROOF_SOURCES += $(PROOFDIR)/$(HARNESS_FILE).c
41-
PROOF_SOURCES += $(SRCDIR)/libraries/standard/http/cbmc/sources/http_cbmc_state.c
42-
PROOF_SOURCES += $(SRCDIR)/libraries/standard/http/cbmc/stubs/HTTPClient_ReadHeader_http_parser_execute.c
41+
PROOF_SOURCES += $(SRCDIR)/cbmc/sources/http_cbmc_state.c
42+
PROOF_SOURCES += $(SRCDIR)/cbmc/stubs/HTTPClient_ReadHeader_http_parser_execute.c
4343

44-
PROJECT_SOURCES += $(SRCDIR)/libraries/standard/http/src/http_client.c
44+
PROJECT_SOURCES += $(SRCDIR)/source/http_client.c
4545

4646

4747
include ../Makefile.common

cbmc/proofs/HTTPClient_ReadHeader/cbmc-viewer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@
33

44
],
55
"proof-name": "HTTPClient_ReadHeader",
6-
"proof-root": "libraries/standard/http/cbmc/proofs"
6+
"proof-root": "cbmc/proofs"
77
}

cbmc/proofs/HTTPClient_Send/Makefile

+4-4
Original file line numberDiff line numberDiff line change
@@ -54,10 +54,10 @@ UNWINDSET += __CPROVER_file_local_http_client_c_sendHttpData.0:10
5454
UNWINDSET += strncmp.0:5
5555

5656
PROOF_SOURCES += $(PROOFDIR)/$(HARNESS_FILE).c
57-
PROOF_SOURCES += $(SRCDIR)/libraries/standard/http/cbmc/sources/http_cbmc_state.c
58-
PROOF_SOURCES += $(SRCDIR)/libraries/standard/http/cbmc/stubs/HTTPClient_Send_http_parser_execute.c
59-
PROOF_SOURCES += $(SRCDIR)/libraries/standard/http/cbmc/stubs/transport_interface_stubs.c
57+
PROOF_SOURCES += $(SRCDIR)/cbmc/sources/http_cbmc_state.c
58+
PROOF_SOURCES += $(SRCDIR)/cbmc/stubs/HTTPClient_Send_http_parser_execute.c
59+
PROOF_SOURCES += $(SRCDIR)/cbmc/stubs/transport_interface_stubs.c
6060

61-
PROJECT_SOURCES += $(SRCDIR)/libraries/standard/http/src/http_client.c
61+
PROJECT_SOURCES += $(SRCDIR)/source/http_client.c
6262

6363
include ../Makefile.common

cbmc/proofs/HTTPClient_Send/cbmc-viewer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@
33

44
],
55
"proof-name": "HTTPClient_Send",
6-
"proof-root": "libraries/standard/http/cbmc/proofs"
6+
"proof-root": "cbmc/proofs"
77
}

cbmc/proofs/HTTPClient_strerror/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,6 @@ UNWINDSET +=
3030

3131
PROOF_SOURCES += $(PROOFDIR)/$(HARNESS_FILE).c
3232

33-
PROJECT_SOURCES += $(SRCDIR)/libraries/standard/http/src/http_client.c
33+
PROJECT_SOURCES += $(SRCDIR)/source/http_client.c
3434

3535
include ../Makefile.common

cbmc/proofs/HTTPClient_strerror/cbmc-viewer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@
33

44
],
55
"proof-name": "HTTPClient_strerror",
6-
"proof-root": "libraries/standard/http/cbmc/proofs"
6+
"proof-root": "cbmc/proofs"
77
}

cbmc/proofs/Makefile-project-defines

+32-33
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,32 @@
1-
# -*- mode: makefile -*-
2-
# The first line sets the emacs major mode to Makefile
3-
4-
################################################################
5-
# Use this file to give project-specific definitions of the command
6-
# line arguments to pass to CBMC tools like goto-cc to build the goto
7-
# binaries and cbmc to do the property and coverage checking.
8-
#
9-
# Use this file to override most default definitions of variables in
10-
# Makefile.common.
11-
################################################################
12-
13-
# Flags to pass to goto-cc for compilation (typically those passed to gcc -c)
14-
COMPILE_FLAGS += -fPIC
15-
COMPILE_FLAGS += -std=gnu90
16-
17-
# Flags to pass to goto-cc for linking (typically those passed to gcc)
18-
# LINK_FLAGS =
19-
20-
# Preprocessor include paths -I...
21-
INCLUDES += -I$(SRCDIR)/libraries/standard/http/cbmc/include
22-
INCLUDES += -I$(SRCDIR)/libraries/standard/http/include
23-
INCLUDES += -I$(SRCDIR)/libraries/standard/http/src
24-
INCLUDES += -I$(SRCDIR)/libraries/standard/http/third_party/http_parser
25-
INCLUDES += -I$(SRCDIR)/demos/logging-stack
26-
INCLUDES += -I$(SRCDIR)/platform/include
27-
28-
# Preprocessor definitions -D...
29-
DEFINES += -Dhttp_EXPORTS
30-
31-
# Ensure that all assumptions are sound by checking that "all pointers
32-
# in pointer primitives are valid or null"
33-
CHECKFLAGS += --pointer-primitive-check
1+
# -*- mode: makefile -*-
2+
# The first line sets the emacs major mode to Makefile
3+
4+
################################################################
5+
# Use this file to give project-specific definitions of the command
6+
# line arguments to pass to CBMC tools like goto-cc to build the goto
7+
# binaries and cbmc to do the property and coverage checking.
8+
#
9+
# Use this file to override most default definitions of variables in
10+
# Makefile.common.
11+
################################################################
12+
13+
# Flags to pass to goto-cc for compilation (typically those passed to gcc -c)
14+
COMPILE_FLAGS += -fPIC
15+
COMPILE_FLAGS += -std=gnu90
16+
17+
# Flags to pass to goto-cc for linking (typically those passed to gcc)
18+
# LINK_FLAGS =
19+
20+
# Preprocessor include paths -I...
21+
INCLUDES += -I$(SRCDIR)/cbmc/include
22+
INCLUDES += -I$(SRCDIR)/source/include
23+
INCLUDES += -I$(SRCDIR)/source/portable
24+
INCLUDES += -I$(SRCDIR)/source
25+
INCLUDES += -I$(SRCDIR)/source/third_party/http_parser
26+
27+
# Preprocessor definitions -D...
28+
DEFINES += -Dhttp_EXPORTS
29+
30+
# Ensure that all assumptions are sound by checking that "all pointers
31+
# in pointer primitives are valid or null"
32+
CHECKFLAGS += --pointer-primitive-check

cbmc/proofs/Makefile-project-targets

+3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
# -*- mode: makefile -*-
22
# The first line sets the emacs major mode to Makefile
33

4+
# Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
5+
# SPDX-License-Identifier: Apache-2.0
6+
47
################################################################
58
# Use this file to give project-specific targets, including targets
69
# that may depend on targets defined in Makefile.common.

cbmc/proofs/Makefile-project-testing

+3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
# -*- mode: makefile -*-
22
# The first line sets the emacs major mode to Makefile
33

4+
# Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
5+
# SPDX-License-Identifier: Apache-2.0
6+
47
################################################################
58
# Use this file to define project-specific targets and definitions for
69
# unit testing or continuous integration that may depend on targets

cbmc/proofs/Makefile-template-defines

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
SRCDIR ?= $(abspath $(PROOF_ROOT)/../../../../..)
1+
SRCDIR ?= $(abspath $(PROOF_ROOT)/../..)

cbmc/proofs/Makefile.common

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
../../../../../tools/aws-templates-for-cbmc-proofs/template-for-repository/proofs/Makefile.common
1+
../aws-templates-for-cbmc-proofs/template-for-repository/proofs/Makefile.common

cbmc/proofs/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
../../../../../tools/aws-templates-for-cbmc-proofs/template-for-repository/proofs/README.md
1+
../aws-templates-for-cbmc-proofs/template-for-repository/proofs/README.md

cbmc/proofs/findHeaderFieldParserCallback/Makefile

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ REMOVE_FUNCTION_BODY +=
1515
UNWINDSET += strncmp.0:$(MAX_HEADER_FIELD_LENGTH)
1616

1717
PROOF_SOURCES += $(PROOFDIR)/$(HARNESS_FILE).c
18-
PROOF_SOURCES += $(SRCDIR)/libraries/standard/http/cbmc/sources/http_cbmc_state.c
18+
PROOF_SOURCES += $(SRCDIR)/cbmc/sources/http_cbmc_state.c
1919

20-
PROJECT_SOURCES += $(SRCDIR)/libraries/standard/http/src/http_client.c
20+
PROJECT_SOURCES += $(SRCDIR)/source/http_client.c
2121

2222
include ../Makefile.common

cbmc/proofs/findHeaderFieldParserCallback/cbmc-viewer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@
33

44
],
55
"proof-name": "findHeaderFieldParserCallback",
6-
"proof-root": "libraries/standard/http/cbmc/proofs"
6+
"proof-root": "cbmc/proofs"
77
}

cbmc/proofs/findHeaderOnHeaderCompleteCallback/Makefile

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ REMOVE_FUNCTION_BODY +=
1111
UNWINDSET +=
1212

1313
PROOF_SOURCES += $(PROOFDIR)/$(HARNESS_FILE).c
14-
PROOF_SOURCES += $(SRCDIR)/libraries/standard/http/cbmc/sources/http_cbmc_state.c
14+
PROOF_SOURCES += $(SRCDIR)/cbmc/sources/http_cbmc_state.c
1515

16-
PROJECT_SOURCES += $(SRCDIR)/libraries/standard/http/src/http_client.c
16+
PROJECT_SOURCES += $(SRCDIR)/source/http_client.c
1717

1818
include ../Makefile.common

cbmc/proofs/findHeaderOnHeaderCompleteCallback/cbmc-viewer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@
33

44
],
55
"proof-name": "findHeaderOnHeaderCompleteCallback",
6-
"proof-root": "libraries/standard/http/cbmc/proofs"
6+
"proof-root": "cbmc/proofs"
77
}

cbmc/proofs/findHeaderValueParserCallback/Makefile

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ REMOVE_FUNCTION_BODY +=
1111
UNWINDSET +=
1212

1313
PROOF_SOURCES += $(PROOFDIR)/$(HARNESS_FILE).c
14-
PROOF_SOURCES += $(SRCDIR)/libraries/standard/http/cbmc/sources/http_cbmc_state.c
14+
PROOF_SOURCES += $(SRCDIR)/cbmc/sources/http_cbmc_state.c
1515

16-
PROJECT_SOURCES += $(SRCDIR)/libraries/standard/http/src/http_client.c
16+
PROJECT_SOURCES += $(SRCDIR)/source/http_client.c
1717

1818
include ../Makefile.common

cbmc/proofs/findHeaderValueParserCallback/cbmc-viewer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@
33

44
],
55
"proof-name": "findHeaderValueParserCallback",
6-
"proof-root": "libraries/standard/http/cbmc/proofs"
6+
"proof-root": "cbmc/proofs"
77
}

cbmc/proofs/httpParserOnBodyCallback/Makefile

+3-3
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ REMOVE_FUNCTION_BODY += memmove
1212
UNWINDSET +=
1313

1414
PROOF_SOURCES += $(PROOFDIR)/$(HARNESS_FILE).c
15-
PROOF_SOURCES += $(SRCDIR)/libraries/standard/http/cbmc/sources/http_cbmc_state.c
16-
PROOF_SOURCES += $(SRCDIR)/libraries/standard/http/cbmc/stubs/memmove.c
15+
PROOF_SOURCES += $(SRCDIR)/cbmc/sources/http_cbmc_state.c
16+
PROOF_SOURCES += $(SRCDIR)/cbmc/stubs/memmove.c
1717

18-
PROJECT_SOURCES += $(SRCDIR)/libraries/standard/http/src/http_client.c
18+
PROJECT_SOURCES += $(SRCDIR)/source/http_client.c
1919

2020
include ../Makefile.common

cbmc/proofs/httpParserOnBodyCallback/cbmc-viewer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@
33

44
],
55
"proof-name": "httpParserOnBodyCallback",
6-
"proof-root": "libraries/standard/http/cbmc/proofs"
6+
"proof-root": "cbmc/proofs"
77
}

cbmc/proofs/httpParserOnHeaderFieldCallback/Makefile

+3-3
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ REMOVE_FUNCTION_BODY +=
1111
UNWINDSET +=
1212

1313
PROOF_SOURCES += $(PROOFDIR)/$(HARNESS_FILE).c
14-
PROOF_SOURCES += $(SRCDIR)/libraries/standard/http/cbmc/sources/http_cbmc_state.c
15-
PROOF_SOURCES += $(SRCDIR)/libraries/standard/http/cbmc/stubs/callback_stubs.c
14+
PROOF_SOURCES += $(SRCDIR)/cbmc/sources/http_cbmc_state.c
15+
PROOF_SOURCES += $(SRCDIR)/cbmc/stubs/callback_stubs.c
1616

17-
PROJECT_SOURCES += $(SRCDIR)/libraries/standard/http/src/http_client.c
17+
PROJECT_SOURCES += $(SRCDIR)/source/http_client.c
1818

1919
include ../Makefile.common

cbmc/proofs/httpParserOnHeaderFieldCallback/cbmc-viewer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@
33

44
],
55
"proof-name": "httpParserOnHeaderFieldCallback",
6-
"proof-root": "libraries/standard/http/cbmc/proofs"
6+
"proof-root": "cbmc/proofs"
77
}

cbmc/proofs/httpParserOnHeaderValueCallback/Makefile

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ REMOVE_FUNCTION_BODY +=
1111
UNWINDSET +=
1212

1313
PROOF_SOURCES += $(PROOFDIR)/$(HARNESS_FILE).c
14-
PROOF_SOURCES += $(SRCDIR)/libraries/standard/http/cbmc/sources/http_cbmc_state.c
14+
PROOF_SOURCES += $(SRCDIR)/cbmc/sources/http_cbmc_state.c
1515

16-
PROJECT_SOURCES += $(SRCDIR)/libraries/standard/http/src/http_client.c
16+
PROJECT_SOURCES += $(SRCDIR)/source/http_client.c
1717

1818
include ../Makefile.common

cbmc/proofs/httpParserOnHeaderValueCallback/cbmc-viewer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@
33

44
],
55
"proof-name": "httpParserOnHeaderValueCallback",
6-
"proof-root": "libraries/standard/http/cbmc/proofs"
6+
"proof-root": "cbmc/proofs"
77
}

cbmc/proofs/httpParserOnHeadersCompleteCallback/Makefile

+3-3
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ REMOVE_FUNCTION_BODY +=
1111
UNWINDSET +=
1212

1313
PROOF_SOURCES += $(PROOFDIR)/$(HARNESS_FILE).c
14-
PROOF_SOURCES += $(SRCDIR)/libraries/standard/http/cbmc/sources/http_cbmc_state.c
15-
PROOF_SOURCES += $(SRCDIR)/libraries/standard/http/cbmc/stubs/callback_stubs.c
14+
PROOF_SOURCES += $(SRCDIR)/cbmc/sources/http_cbmc_state.c
15+
PROOF_SOURCES += $(SRCDIR)/cbmc/stubs/callback_stubs.c
1616

17-
PROJECT_SOURCES += $(SRCDIR)/libraries/standard/http/src/http_client.c
17+
PROJECT_SOURCES += $(SRCDIR)/source/http_client.c
1818

1919
include ../Makefile.common

cbmc/proofs/httpParserOnHeadersCompleteCallback/cbmc-viewer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@
33

44
],
55
"proof-name": "httpParserOnHeadersCompleteCallback",
6-
"proof-root": "libraries/standard/http/cbmc/proofs"
6+
"proof-root": "cbmc/proofs"
77
}

0 commit comments

Comments
 (0)