Skip to content

Commit 3886a48

Browse files
author
Kevin Cadieux
committed
Merge remote-tracking branch 'upstream/master'
2 parents d9fd0e6 + 548561a commit 3886a48

File tree

5,107 files changed

+69454
-39301
lines changed

Some content is hidden

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

5,107 files changed

+69454
-39301
lines changed

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ _themes/
66
_themes.MSDN.Modern/
77
_themes.VS.Modern/
88

9+
# Ignore local configuration changes
10+
.github/
911
.openpublishing.buildcore.ps1
1012
.vscode/
1113

.openpublishing.redirection.json

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -685,6 +685,21 @@
685685
"redirect_url": "/cpp/build-insights/get-started-with-cpp-build-insights",
686686
"redirect_document_id": false
687687
},
688+
{
689+
"source_path": "docs/build-insights/vcperf-reference.md",
690+
"redirect_url": "/cpp/build-insights/reference/vcperf-commands",
691+
"redirect_document_id": false
692+
},
693+
{
694+
"source_path": "docs/build-insights/wpa-basics.md",
695+
"redirect_url": "/cpp/build-insights/tutorials/wpa-basics",
696+
"redirect_document_id": false
697+
},
698+
{
699+
"source_path": "docs/build-insights/wpa-views-reference.md",
700+
"redirect_url": "/cpp/build-insights/reference/wpa-views",
701+
"redirect_document_id": false
702+
},
688703
{
689704
"source_path": "docs/c-language/index.md",
690705
"redirect_url": "/cpp/c-language/c-language-reference",

.vscode/extensions.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"recommendations": [
3+
"docsmsft.docs-authoring-pack"
4+
]
5+
}

.vscode/settings.json

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,16 @@
22
"files.associations": {
33
"random": "cpp"
44
},
5-
6-
"git.ignoreLimitWarning": true
5+
"git.ignoreLimitWarning": true,
6+
"markdown.docsetLanguages": [
7+
"ARM assembler",
8+
"C",
9+
"C#",
10+
"C++",
11+
"HTML",
12+
"JSON",
13+
"Makefile",
14+
"VB.NET",
15+
"XML"
16+
]
717
}

CONTRIBUTING.md

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@ In this topic, you'll see the basic process for adding or updating content in th
66

77
In this topic, we'll cover:
88

9-
* [Process for contributing](#process-for-contributing)
10-
* [DOs and DON'Ts](#dos-and-donts)
11-
* [Building the docs](#building-the-docs)
12-
* [Contributing to samples](#contributing-to-samples)
13-
* [Contributor license agreement](#contributor-license-agreement)
9+
- [Process for contributing](#process-for-contributing)
10+
- [DOs and DON'Ts](#dos-and-donts)
11+
- [Building the docs](#building-the-docs)
12+
- [Contributing to samples](#contributing-to-samples)
13+
- [Contributor license agreement](#contributor-license-agreement)
1414

1515
## Process for contributing
1616

@@ -36,11 +36,13 @@ Be sure to follow the proper Markdown syntax. See the [style guide](./styleguide
3636

3737
### Example structure
3838

39-
docs
40-
/standard-library
41-
wstring-convert-class.md
42-
/media
43-
wstring-conversion.png
39+
```
40+
docs
41+
/standard-library
42+
wstring-convert-class.md
43+
/media
44+
wstring-conversion.png
45+
```
4446

4547
**Step 5:** Submit a Pull Request (PR) from your branch to `MicrosoftDocs/cpp-docs/master`.
4648

docs/_breadcrumb/toc.yml

Lines changed: 41 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -2,24 +2,24 @@
22
tocHref: /
33
topicHref: /
44
items:
5-
- name: Visual C++
5+
- name: Microsoft C++
66
tocHref: /cpp/
77
topicHref: /cpp
88
items:
99
- name: Documentation
1010
tocHref: /cpp/
1111
topicHref: /cpp/overview/visual-cpp-in-visual-studio
1212
items:
13-
- name: C++ Language
13+
- name: C++ language
1414
tocHref: /cpp/cpp/
1515
topicHref: /cpp/cpp/cpp-language-reference
1616
- name: C Language
1717
tocHref: /cpp/c-language/
1818
topicHref: /cpp/c-language/c-language-reference
19-
- name: C/C++ Preprocessor
19+
- name: C/C++ preprocessor
2020
tocHref: /cpp/preprocessor/
2121
topicHref: /cpp/preprocessor/c-cpp-preprocessor-reference
22-
- name: Compiler Intrinsics and Assembly Language
22+
- name: Compiler intrinsics and assembly language
2323
tocHref: /cpp/intrinsics/
2424
topicHref: /cpp/intrinsics/compiler-intrinsics-and-assembly-language
2525
items:
@@ -32,86 +32,88 @@
3232
- name: MASM
3333
tocHref: /cpp/assembler/masm/
3434
topicHref: /cpp/assembler/masm/microsoft-macro-assembler-reference
35-
- name: C Runtime Library
35+
- name: C runtime library
3636
tocHref: /cpp/c-runtime-library/
3737
topicHref: /cpp/c-runtime-library/c-run-time-library-reference
3838
items:
3939
- name: Reference
4040
tocHref: /cpp/c-runtime-library/reference/
4141
topicHref: /cpp/c-runtime-library/reference/crt-alphabetical-function-reference
42-
- name: C++ Standard Library
42+
- name: C++ standard library
4343
tocHref: /cpp/standard-library/
4444
topicHref: /cpp/standard-library/cpp-standard-library-reference
4545
- name: Windows
4646
tocHref: /cpp/windows/
4747
topicHref: /cpp/windows/overview-of-windows-programming-in-cpp
4848
items:
49-
- name: ATL
50-
tocHref: /cpp/atl/
51-
topicHref: /cpp/atl/atl-com-desktop-components
52-
- name: MFC
53-
tocHref: /cpp/mfc/
54-
topicHref: /cpp/mfc/mfc-desktop-applications
55-
items:
56-
- name: Reference
57-
tocHref: /cpp/mfc/reference/
58-
topicHref: /cpp/mfc/reference/mfc-classes
59-
- name: ATL/MFC Shared Classes
60-
tocHref: /cpp/atl-mfc-shared/
61-
topicHref: /cpp/atl-mfc-shared/atl-mfc-shared-classes
62-
items:
63-
- name: Reference
64-
tocHref: /cpp/atl-mfc-shared/reference/
65-
topicHref: /cpp/atl-mfc-shared/reference/classes-shared-by-mfc-and-atl
66-
- name: C++/CX
67-
tocHref: /cpp/cppcx/
68-
topicHref: /cpp/cppcx/visual-c-language-reference-c-cx
49+
- name: ATL
50+
tocHref: /cpp/atl/
51+
topicHref: /cpp/atl/atl-com-desktop-components
52+
- name: MFC
53+
tocHref: /cpp/mfc/
54+
topicHref: /cpp/mfc/mfc-desktop-applications
55+
items:
56+
- name: Reference
57+
tocHref: /cpp/mfc/reference/
58+
topicHref: /cpp/mfc/reference/mfc-classes
59+
- name: ATL/MFC shared classes
60+
tocHref: /cpp/atl-mfc-shared/
61+
topicHref: /cpp/atl-mfc-shared/atl-mfc-shared-classes
62+
items:
63+
- name: Reference
64+
tocHref: /cpp/atl-mfc-shared/reference/
65+
topicHref: /cpp/atl-mfc-shared/reference/classes-shared-by-mfc-and-atl
66+
- name: C++/CX
67+
tocHref: /cpp/cppcx/
68+
topicHref: /cpp/cppcx/visual-c-language-reference-c-cx
6969
- name: Linux
7070
tocHref: /cpp/linux/
7171
topicHref: /cpp/linux/download-install-and-setup-the-linux-development-workload
7272
- name: .NET
7373
tocHref: /cpp/dotnet/
7474
topicHref: /cpp/dotnet/dotnet-programming-with-cpp-cli-visual-cpp
75-
- name: Parallel Programming
75+
- name: Parallel programming
7676
tocHref: /cpp/parallel/
7777
topicHref: /cpp/parallel/parallel-programming-in-visual-cpp
78-
- name: Data Access
78+
- name: Data access
7979
tocHref: /cpp/data/
8080
topicHref: /cpp/data/data-access-in-cpp
8181
items:
8282
- name: OLEDB
8383
tocHref: /cpp/data/oledb/
84-
topicHref: /cpp/data/oledb/ole-db-programming
84+
topicHref: /cpp/data/oledb/ole-db-programming
8585
- name: ODBC
8686
tocHref: /cpp/data/odbc/
8787
topicHref: /cpp/data/odbc/open-database-connectivity-odbc
8888
- name: Edit, navigate, and refactor code
8989
tocHref: /cpp/ide
90-
topicHref: /cpp/overview-of-cpp-development
90+
topicHref: /cpp/ide/read-and-understand-code-cpp
9191
items:
9292
- name: IDE
9393
tocHref: /cpp/ide/
9494
topicHref: /cpp/ide/using-the-visual-studio-ide-for-cpp-desktop-development
95-
- name: Building C/C++ Projects
95+
- name: Building C/C++ projects
9696
tocHref: /cpp/build/
9797
topicHref: /cpp/build/building-c-cpp-programs
9898
items:
99-
- name: Build Reference
99+
- name: Build reference
100100
tocHref: /cpp/build/reference/
101101
topicHref: /cpp/build/reference/c-cpp-building-reference
102-
items:
103-
- name: Compiler and tool errors and warnings
104-
tocHref: /cpp/error-messages/
105-
topicHref: /cpp/error-messages/compiler-errors-1/c-cpp-build-errors
106-
- name: Porting and Upgrading
102+
- name: Build insights
103+
tocHref: /cpp/build-insights/
104+
topicHref: /cpp/build-insights/get-started-with-cpp-build-insights
105+
- name: Errors and warnings
106+
tocHref: /cpp/error-messages/
107+
topicHref: /cpp/error-messages/compiler-errors-1/c-cpp-build-errors
108+
- name: Porting and upgrading
107109
tocHref: /cpp/porting/
108110
topicHref: /cpp/porting/visual-cpp-porting-and-upgrading-guide
109-
- name: Text and Strings
111+
- name: Text and strings
110112
tocHref: /cpp/text/
111113
topicHref: /cpp/text/text-and-strings-in-visual-cpp
112114
- name: Security
113115
tocHref: /cpp/security
114116
topicHref: /cpp/security/security-best-practices-for-cpp
115-
- name: Cloud and Web
117+
- name: Cloud and web
116118
tocHref: /cpp/cloud
117119
topicHref: /cpp/cloud/cloud-and-web-programming-in-visual-cpp
Lines changed: 36 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,84 +1,82 @@
11
---
2-
title: "ARM Assembler Command-Line Reference"
3-
ms.date: "08/30/2018"
2+
title: "ARM Assembler command-line reference"
3+
description: "Reference guide to the Microsoft ARM assembler command-line options."
4+
ms.date: "02/09/2020"
45
ms.assetid: f7b89478-1ab5-4995-8cde-a805f0462c45
56
---
6-
# ARM Assembler Command-Line Reference
7+
# ARM Assembler command-line reference
78

8-
This article provides command-line information about the Microsoft ARM assembler, *armasm*, which compiles ARMv7 Thumb assembly language into the Microsoft implementation of the Common Object File Format (COFF). The linker can link COFF code with object code that is produced by the ARM assembler or by the C compiler, together with object libraries that are created by the librarian.
9+
This article provides command-line information about the Microsoft ARM assembler, **armasm**. **armasm** assembles ARMv7 Thumb assembly language into the Microsoft implementation of the Common Object File Format (COFF). The linker can link COFF code objects produced by both the ARM assembler and the C compiler. It can link either together with object libraries created by the librarian.
910

1011
## Syntax
1112

12-
> **armasm** [*options*] *sourcefile* *objectfile*
13-
> **armasm** [*options*] **-o** *objectfile* *sourcefile*
13+
> **`armasm`** [*options*] *source_file* *object_file*\
14+
> **`armasm`** [*options*] **`-o`** *object_file* *source_file*
1415
1516
### Parameters
1617

17-
*options*<br/>
18-
A combination of zero or more of the following:
18+
*options*\
19+
A combination of zero or more of the following options:
1920

20-
- **-errors** *filename*<br/>
21+
- **`-errors`** *filename*\
2122
Redirect error and warning messages to *filename*.
2223

23-
- **-i** *dir*[**;**<em>dir</em>]<br/>
24+
- **`-i`** *dir*[**`;`**<em>dir</em>]\
2425
Add the specified directories to the include search path.
2526

26-
- **-predefine** *directive*<br/>
27-
Specify a SETA, SETL, or SETS directive to predefine a symbol.<br/>
28-
Example: **armasm.exe -predefine "COUNT SETA 150" source.asm**<br/>
27+
- **`-predefine`** *directive*\
28+
Specify a SETA, SETL, or SETS directive to predefine a symbol.\
29+
Example: `armasm.exe -predefine "COUNT SETA 150" source.asm`\
2930
For more information, see the [ARM Compiler armasm Reference Guide](http://infocenter.arm.com/help/topic/com.arm.doc.dui0802b/index.html).
3031

31-
- **-nowarn**<br/>
32+
- **`-nowarn`**\
3233
Disable all warning messages.
3334

34-
- **-ignore** *warning*<br/>
35+
- **`-ignore`** *warning*\
3536
Disable the specified warning. For possible values, see the section about warnings.
3637

37-
- **-help**<br/>
38+
- **`-help`**\
3839
Print the command-line help message.
3940

40-
- **-machine** *machine*<br/>
41-
Specify the machine type to set in the PE header. Possible values for *machine* are:<br/>
42-
**ARM**—Sets the machine type to IMAGE_FILE_MACHINE_ARMNT. This is the default.<br/>
41+
- **`-machine`** *machine*\
42+
Specify the machine type to set in the PE header. Possible values for *machine* are:\
43+
**ARM**—Sets the machine type to IMAGE_FILE_MACHINE_ARMNT. This option is the default.\
4344
**THUMB**—Sets the machine type to IMAGE_FILE_MACHINE_THUMB.
4445

45-
- **-oldit**<br/>
46+
- **`-oldit`**\
4647
Generate ARMv7-style IT blocks. By default, ARMv8-compatible IT blocks are generated.
4748

48-
- **-via** *filename*<br/>
49+
- **`-via`** *filename*\
4950
Read additional command-line arguments from *filename*.
5051

51-
- **-16**<br/>
52-
Assemble source as 16-bit Thumb instructions. This is the default.
52+
- **`-16`**\
53+
Assemble source as 16-bit Thumb instructions. This option is the default.
5354

54-
- **-32**<br/>
55+
- **`-32`**\
5556
Assemble source as 32-bit ARM instructions.
5657

57-
- **-g**<br/>
58+
- **`-g`**\
5859
Generate debugging information.
5960

60-
- **-errorReport:** *option*<br/>
61-
Specify how internal assembler errors are reported to Microsoft. Possible values for *option* are:<br/>
62-
**none**—Do not send reports.<br/>
63-
**prompt**—Prompt the user to send reports immediately.<br/>
64-
**queue**—Prompt the user to send reports at the next admin logon. This is the default.<br/>
65-
**send**—Send reports automatically.
61+
- **`-errorReport:`** *option*\
62+
This option is deprecated. Starting in Windows Vista, error reporting is controlled by [Windows Error Reporting (WER)](/windows/win32/wer/windows-error-reporting) settings.
6663

67-
*sourcefile*<br/>
64+
*source_file*\
6865
The name of the source file.
6966

70-
*objectfile*<br/>
67+
*object_file*\
7168
The name of the object (output) file.
7269

7370
## Remarks
7471

7572
The following example demonstrates how to use armasm in a typical scenario. First, use armasm to build an assembly language source (.asm) file to an object (.obj) file. Then, use the CL command-line C compiler to compile a source (.c) file, and also specify the linker option to link the ARM object file.
7673

77-
**armasm myasmcode.asm -o myasmcode.obj**
78-
79-
**cl myccode.c /link myasmcode.obj**
74+
```cmd
75+
armasm myasmcode.asm -o myasmcode.obj
76+
cl myccode.c /link myasmcode.obj
77+
```
8078

8179
## See also
8280

83-
[ARM Assembler Diagnostic Messages](../../assembler/arm/arm-assembler-diagnostic-messages.md)<br/>
84-
[ARM Assembler Directives](../../assembler/arm/arm-assembler-directives.md)<br/>
81+
[ARM Assembler diagnostic messages](../../assembler/arm/arm-assembler-diagnostic-messages.md)\
82+
[ARM Assembler directives](../../assembler/arm/arm-assembler-directives.md)

docs/assembler/inline/accessing-c-or-cpp-data-in-asm-blocks.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,4 +66,4 @@ You can access data members in C++ without regard to access restrictions. Howeve
6666

6767
## See also
6868

69-
[Using C or C++ in __asm Blocks](../../assembler/inline/using-c-or-cpp-in-asm-blocks.md)<br/>
69+
[Using C or C++ in __asm Blocks](../../assembler/inline/using-c-or-cpp-in-asm-blocks.md)<br/>

docs/assembler/inline/advantages-of-inline-assembly.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,4 +26,4 @@ Inline assembly is a special-purpose tool. If you plan to port an application to
2626

2727
## See also
2828

29-
[Inline Assembler](../../assembler/inline/inline-assembler.md)<br/>
29+
[Inline Assembler](../../assembler/inline/inline-assembler.md)<br/>

docs/assembler/inline/asm.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,4 +77,4 @@ Unlike braces in C and C++, the braces enclosing an `__asm` block don't affect v
7777
## See also
7878

7979
[Keywords](../../cpp/keywords-cpp.md)<br/>
80-
[Inline Assembler](../../assembler/inline/inline-assembler.md)<br/>
80+
[Inline Assembler](../../assembler/inline/inline-assembler.md)<br/>

docs/assembler/inline/assembly-language-comments.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,4 @@ Because C macros expand into a single logical line, avoid using assembly-languag
2020

2121
## See also
2222

23-
[Using Assembly Language in __asm Blocks](../../assembler/inline/using-assembly-language-in-asm-blocks.md)<br/>
23+
[Using Assembly Language in __asm Blocks](../../assembler/inline/using-assembly-language-in-asm-blocks.md)<br/>

0 commit comments

Comments
 (0)