Skip to content

Commit 11825ed

Browse files
author
Colin Robertson
authored
Merge branch 'master' into cr-1896
2 parents e742295 + 2707cbc commit 11825ed

File tree

3,525 files changed

+35563
-8993
lines changed

Some content is hidden

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

3,525 files changed

+35563
-8993
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

.markdownlint.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{
22
"default": true,
33
"MD002": false,
4+
"DOCSMD006": false,
45
"MD013": false,
56
"MD024": { "siblings_only": true },
67
"MD025": { "front_matter_title": "" },

.openpublishing.redirection.json

Lines changed: 30 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",
@@ -7535,6 +7550,21 @@
75357550
"redirect_url": "/cpp/mfc/reference/mfc-add-class-wizard",
75367551
"redirect_document_id": false
75377552
},
7553+
{
7554+
"source_path": "docs/mfc/drag-and-drop-customizing.md",
7555+
"redirect_url": "/cpp/mfc/drag-and-drop-ole#customize-drag-and-drop",
7556+
"redirect_document_id": false
7557+
},
7558+
{
7559+
"source_path": "docs/mfc/drag-and-drop-implementing-a-drop-source.md",
7560+
"redirect_url": "/cpp/mfc/drag-and-drop-ole#implement-a-drop-source",
7561+
"redirect_document_id": false
7562+
},
7563+
{
7564+
"source_path": "docs/mfc/drag-and-drop-implementing-a-drop-target.md",
7565+
"redirect_url": "/cpp/mfc/drag-and-drop-ole#implement-a-drop-target",
7566+
"redirect_document_id": false
7567+
},
75387568
{
75397569
"source_path": "docs/mfc/automatic-linking-of-mfc-library-version.md",
75407570
"redirect_url": "/cpp/mfc/mfc-library-versions",

.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: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -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

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/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/>

docs/assembler/inline/calling-c-functions-in-inline-assembly.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,4 +50,4 @@ the example pushes pointers to `world`, `hello`, and `format`, in that order, an
5050

5151
## See also
5252

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

docs/assembler/inline/calling-cpp-functions-in-inline-assembly.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,4 @@ You can also call any functions declared with **extern "C"** linkage. This allow
1616

1717
## See also
1818

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

docs/assembler/inline/data-directives-and-operators-in-inline-assembly.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,4 @@ Although an `__asm` block can reference C or C++ data types and objects, it cann
1414

1515
## See also
1616

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

docs/assembler/inline/debugging-and-listings-for-inline-assembly.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,4 @@ If you create a mixed source and assembly listing with the [/FAs](../../build/re
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/>

docs/assembler/inline/defining-asm-blocks-as-c-macros.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,4 +48,4 @@ Be careful not to invoke macros of this type indiscriminately. For instance, inv
4848
4949
## See also
5050
51-
[Inline Assembler](../../assembler/inline/inline-assembler.md)<br/>
51+
[Inline Assembler](../../assembler/inline/inline-assembler.md)<br/>

docs/assembler/inline/emit-pseudoinstruction.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,4 +30,4 @@ __asm {
3030
3131
## See also
3232
33-
[Using Assembly Language in __asm Blocks](../../assembler/inline/using-assembly-language-in-asm-blocks.md)<br/>
33+
[Using Assembly Language in __asm Blocks](../../assembler/inline/using-assembly-language-in-asm-blocks.md)<br/>

docs/assembler/inline/even-and-align-directives.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
---
22
title: "EVEN and ALIGN Directives"
33
ms.date: "08/30/2018"
4-
f1_keywords: ["align", "EVEN"]
54
helpviewer_keywords: ["EVEN directive", "directives, MASM", "MASM (Microsoft Macro Assembler), directives", "NOP (no operation instruction)", "ALIGN directive"]
65
ms.assetid: 7357ab2d-4a5c-43ca-accb-a5f21cdfcde5
76
---
@@ -15,4 +14,4 @@ Although the inline assembler doesn't support most MASM directives, it does supp
1514

1615
## See also
1716

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

docs/assembler/inline/inline-assembler-overview.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,4 +54,4 @@ __asm push ebp __asm mov ebp, esp __asm sub esp, __LOCAL_SIZE
5454

5555
## See also
5656

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

docs/assembler/inline/inline-assembler.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,4 +42,4 @@ Inline assembly is not supported on the ARM and x64 processors. The following t
4242
## See also
4343

4444
[Compiler Intrinsics and Assembly Language](../../intrinsics/compiler-intrinsics-and-assembly-language.md)<br/>
45-
[C++ Language Reference](../../cpp/cpp-language-reference.md)<br/>
45+
[C++ Language Reference](../../cpp/cpp-language-reference.md)<br/>

docs/assembler/inline/instruction-set-for-inline-assembly.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,4 @@ The Microsoft C++ compiler supports all opcodes through the Pentium 4 and AMD At
1515

1616
## See also
1717

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

docs/assembler/inline/intel-s-mmx-instruction-set.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,4 @@ The Microsoft C++ compiler allows you to use Intel's MMX (multimedia extension)
1515

1616
## See also
1717

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

docs/assembler/inline/jumping-to-labels-in-inline-assembly.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,4 +71,4 @@ farlabel:
7171

7272
## See also
7373

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

docs/assembler/inline/masm-expressions-in-inline-assembly.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,4 @@ Inline assembly code can use any MASM expression, which is any combination of op
1414

1515
## See also
1616

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

docs/assembler/inline/masm-macro-directives-in-inline-assembly.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,4 @@ The inline assembler is not a macro assembler. You cannot use MASM macro directi
1414

1515
## See also
1616

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

docs/assembler/inline/optimizing-inline-assembly.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,4 @@ The presence of an `__asm` block in a function affects optimization in several w
1414

1515
## See also
1616

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

docs/assembler/inline/segment-references-in-inline-assembly.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,4 @@ You must refer to segments by register rather than by name (the segment name `_T
1414

1515
## See also
1616

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

docs/assembler/inline/type-and-variable-sizes-in-inline-assembly.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
title: "Type and Variable Sizes in Inline Assembly"
33
ms.date: "08/30/2018"
44
ms.topic: "reference"
5-
f1_keywords: ["length", "Type"]
65
helpviewer_keywords: ["variables, length", "size, getting in inline assembly", "size", "LENGTH operator", "TYPE operator", "SIZE operator", "inline assembly, operators", "variables, type", "variables, size"]
76
ms.assetid: b62c2f2b-a7ad-4145-bae4-d890db86d348
87
---
@@ -36,4 +35,4 @@ the following C and assembly expressions yield the size of `arr` and its element
3635

3736
## See also
3837

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

docs/assembler/inline/using-and-preserving-registers-in-inline-assembly.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,4 +27,4 @@ Some SSE types require eight-byte stack alignment, forcing the compiler to emit
2727

2828
## See also
2929

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

docs/assembler/inline/using-assembly-language-in-asm-blocks.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,4 +38,4 @@ The inline assembler has much in common with other assemblers. For example, it a
3838

3939
## See also
4040

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

0 commit comments

Comments
 (0)