Skip to content

Commit fb6db3f

Browse files
author
mikeblome
committed
fixed merge conflicts
2 parents 3a1a359 + aab7ba9 commit fb6db3f

7,975 files changed

Lines changed: 503918 additions & 474884 deletions

File tree

Some content is hidden

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

.openpublishing.redirection.json

Lines changed: 1634 additions & 4 deletions
Large diffs are not rendered by default.

docs/assembler/arm/arm-assembler-directives.md

Lines changed: 77 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -16,89 +16,113 @@ For the most part, the Microsoft ARM assembler uses the ARM assembly language, w
1616

1717
## Microsoft Implementations of ARM Assembly Directives
1818

19-
`AREA`<br/>
20-
The Microsoft ARM assembler supports these `AREA` attributes: `ALIGN`, `CODE`, `CODEALIGN`, `DATA`, `NOINIT`, `READONLY`, `READWRITE`, `THUMB`, `ARM`.
19+
- AREA
2120

22-
All except `THUMB` and `ARM` work as documented in the [ARM Compiler armasm Reference Guide](http://infocenter.arm.com/help/topic/com.arm.doc.dui0802b/index.html).
21+
The Microsoft ARM assembler supports these `AREA` attributes: `ALIGN`, `CODE`, `CODEALIGN`, `DATA`, `NOINIT`, `READONLY`, `READWRITE`, `THUMB`, `ARM`.
2322

24-
In the Microsoft ARM assembler, `THUMB` indicates that a `CODE` section contains Thumb code, and is the default for `CODE` sections. `ARM` indicates that the section contains ARM code.
23+
All except `THUMB` and `ARM` work as documented in the [ARM Compiler armasm Reference Guide](http://infocenter.arm.com/help/topic/com.arm.doc.dui0802b/index.html).
2524

26-
`ATTR`<br/>
27-
Not supported.
25+
In the Microsoft ARM assembler, `THUMB` indicates that a `CODE` section contains Thumb code, and is the default for `CODE` sections. `ARM` indicates that the section contains ARM code.
2826

29-
`CODE16`<br/>
30-
Not supported because it implies pre-UAL Thumb syntax, which the Microsoft ARM assembler does not allow. Use the `THUMB` directive instead, along with UAL syntax.
27+
- ATTR
3128

32-
`COMMON`<br/>
33-
Specification of an alignment for the common region is not supported.
29+
Not supported.
3430

35-
`DCDO`<br/>
36-
Not supported.
31+
- CODE16
3732

38-
`DN`, `QN`, `SN`<br/>
39-
Specification of a type or a lane on the register alias is not supported.
33+
Not supported because it implies pre-UAL Thumb syntax, which the Microsoft ARM assembler does not allow. Use the `THUMB` directive instead, along with UAL syntax.
4034

41-
`ENTRY`<br/>
42-
Not supported.
35+
- COMMON
4336

44-
`EQU`<br/>
45-
Specification of a type for the defined symbol is not supported.
37+
Specification of an alignment for the common region is not supported.
4638

47-
`EXPORT` and `GLOBAL`
39+
- DCDO
4840

49-
> **EXPORT** <em>sym</em>{**[**<em>type</em>**]**}
41+
Not supported.
5042

51-
*sym* is the symbol to be exported. [*type*], if specified, can be either `[DATA]` to indicate that the symbol points to data or `[FUNC]` to indicate that the symbol points to code.
43+
- `DN`, `QN`, `SN`
5244

53-
`GLOBAL` is a synonym for `EXPORT`.
45+
Specification of a type or a lane on the register alias is not supported.
5446

55-
`EXPORTAS`<br/>
56-
Not supported.
47+
- ENTRY
5748

58-
`FRAME`<br/>
59-
Not supported.
49+
Not supported.
6050

61-
`FUNCTION` and `PROC`<br/>
62-
Although the assembly syntax supports the specification of a custom calling convention on procedures by listing the registers that are caller-save and those that are callee-save, the Microsoft ARM assembler accepts the syntax but ignores the register lists. The debug information that is produced by the assembler supports only the default calling convention.
51+
- EQU
6352

64-
`IMPORT` and `EXTERN`
53+
Specification of a type for the defined symbol is not supported.
6554

66-
> **IMPORT** *sym*{**, WEAK** *alias*{**, TYPE** *t*}}
55+
- `EXPORT` and `GLOBAL`
6756

68-
*sym* is the name of the symbol to be imported.
57+
Specifies exports using this syntax:
6958

70-
If `WEAK` *alias* is specified, it indicates that *sym* is a weak external. If no definition for it is found at link time, then all references to it bind instead to *alias*.
59+
> **EXPORT**|**GLOBAL** <em>sym</em>{**[**<em>type</em>**]**}
7160
72-
If `TYPE` *t* is specified, then *t* indicates how the linker should attempt to resolve *sym*. These values for *t* are possible:<br/>
73-
1—Do not perform a library search for *sym*<br/>
74-
2—Perform a library search for *sym*<br/>
75-
3—*sym* is an alias for *alias* (default)
61+
*sym* is the symbol to be exported. [*type*], if specified, can be either `[DATA]` to indicate that the symbol points to data or `[FUNC]` to indicate that the symbol points to code. `GLOBAL` is a synonym for `EXPORT`.
7662

77-
`EXTERN` is a synonym for `IMPORT`, except that *sym* is imported only if there are references to it in the current assembly.
63+
- EXPORTAS
7864

79-
`MACRO`<br/>
80-
The use of a variable to hold the condition code of a macro is not supported. Default values for macro parameters are not supported.
65+
Not supported.
8166

82-
`NOFP`<br/>
83-
Not supported.
67+
- FRAME
8468

85-
`OPT`, `TTL`, `SUBT`<br/>
86-
Not supported because the Microsoft ARM assembler does not produce listings.
69+
Not supported.
8770

88-
`PRESERVE8`<br/>
89-
Not supported.
71+
- `FUNCTION` and `PROC`
9072

91-
`RELOC`<br/>
92-
`RELOC n` can only follow an instruction or a data definition directive. There is no "anonymous symbol" that can be relocated.
73+
Although the assembly syntax supports the specification of a custom calling convention on procedures by listing the registers that are caller-save and those that are callee-save, the Microsoft ARM assembler accepts the syntax but ignores the register lists. The debug information that is produced by the assembler supports only the default calling convention.
9374

94-
`REQUIRE`<br/>
95-
Not supported.
75+
- `IMPORT` and `EXTERN`
9676

97-
`REQUIRE8`<br/>
98-
Not supported.
77+
Specifies imports using this syntax:
9978

100-
`THUMBX`<br/>
101-
Not supported because the Microsoft ARM assembler does not support the Thumb-2EE instruction set.
79+
> **IMPORT**|**EXTERN** *sym*{**, WEAK** *alias*{**, TYPE** *t*}}
80+
81+
*sym* is the name of the symbol to be imported.
82+
83+
If `WEAK` *alias* is specified, it indicates that *sym* is a weak external. If no definition for it is found at link time, then all references to it bind instead to *alias*.
84+
85+
If `TYPE` *t* is specified, then *t* indicates how the linker should attempt to resolve *sym*. These values for *t* are possible:
86+
87+
|Value|Description|
88+
|-|-|
89+
|1|Do not perform a library search for *sym*|
90+
|2|Perform a library search for *sym*|
91+
|3|*sym* is an alias for *alias* (default)|
92+
93+
`EXTERN` is a synonym for `IMPORT`, except that *sym* is imported only if there are references to it in the current assembly.
94+
95+
- MACRO
96+
97+
The use of a variable to hold the condition code of a macro is not supported. Default values for macro parameters are not supported.
98+
99+
- NOFP
100+
101+
Not supported.
102+
103+
- `OPT`, `TTL`, `SUBT`
104+
105+
Not supported because the Microsoft ARM assembler does not produce listings.
106+
107+
- PRESERVE8
108+
109+
Not supported.
110+
111+
- RELOC
112+
113+
`RELOC n` can only follow an instruction or a data definition directive. There is no "anonymous symbol" that can be relocated.
114+
115+
- REQUIRE
116+
117+
Not supported.
118+
119+
- REQUIRE8
120+
121+
Not supported.
122+
123+
- THUMBX
124+
125+
Not supported because the Microsoft ARM assembler does not support the Thumb-2EE instruction set.
102126

103127
## See also
104128

docs/assembler/masm/dot-errb.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ Generates an error if *textitem* is blank.
1818

1919
## Syntax
2020

21-
> .ERRB <textitem> [[, message]]
21+
> .ERRB *textitem* [[, *message*]]
2222
2323
## See also
2424

docs/assembler/masm/dot-errdif.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ Generates an error if the text items are different.
1818

1919
## Syntax
2020

21-
> .ERRDIF[[I]] <textitem1>, <textitem2> [[, message]]
21+
> .ERRDIF[[I]] *textitem1*, *textitem2* [[, *message*]]
2222
2323
## Remarks
2424

docs/assembler/masm/dot-erridn.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ Generates an error if the text items are identical.
1818

1919
## Syntax
2020

21-
> .ERRIDN[[I]] <textitem1>, <textitem2> [[, message]]
21+
> .ERRIDN[[I]] *textitem1*, *textitem2* [[, *message*]]
2222
2323
## Remarks
2424

docs/assembler/masm/dot-errnb.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ Generates an error if *textitem* is not blank.
1818

1919
## Syntax
2020

21-
> .ERRNB <textitem> [[, message]]
21+
> .ERRNB *textitem* [[, *message*]]
2222
2323
## See also
2424

docs/atl-mfc-shared/allocating-and-releasing-memory-for-a-bstr.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@ In general, the rules for allocating and releasing memory allocated for `BSTR`s
3636

3737
## See Also
3838

39-
[Strings (ATL/MFC)](../atl-mfc-shared/strings-atl-mfc.md)
40-
[CStringT::AllocSysString](../atl-mfc-shared/reference/cstringt-class.md#allocsysstring)
41-
[SysAllocString](/previous-versions/windows/desktop/api/oleauto/nf-oleauto-sysallocstring)
39+
[Strings (ATL/MFC)](../atl-mfc-shared/strings-atl-mfc.md)<br/>
40+
[CStringT::AllocSysString](../atl-mfc-shared/reference/cstringt-class.md#allocsysstring)<br/>
41+
[SysAllocString](/previous-versions/windows/desktop/api/oleauto/nf-oleauto-sysallocstring)<br/>
4242
[SysFreeString](/previous-versions/windows/desktop/api/oleauto/nf-oleauto-sysfreestring)
4343

docs/atl-mfc-shared/atl-mfc-concepts.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ This section provides conceptual and task-based topics to help you program using
1717

1818
## In This Section
1919

20-
[Strings (ATL/MFC)](../atl-mfc-shared/strings-atl-mfc.md)
20+
[Strings (ATL/MFC)](../atl-mfc-shared/strings-atl-mfc.md)<br/>
2121
Describes how to manage string data in applications.
2222

2323
## See Also

docs/atl-mfc-shared/atl-mfc-shared-classes.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,16 +18,16 @@ These utility classes can be used in any native C++ project without requiring an
1818

1919
## In This Section
2020

21-
[Classes Shared Between MFC and ATL](../atl-mfc-shared/reference/classes-shared-by-mfc-and-atl.md)
21+
[Classes Shared Between MFC and ATL](../atl-mfc-shared/reference/classes-shared-by-mfc-and-atl.md)<br/>
2222
Provides links to the classes shared between MFC and ATL.
2323

2424
## Related Sections
2525

26-
[Active Template Library (ATL) Reference](../atl/atl-com-desktop-components.md)
26+
[Active Template Library (ATL) Reference](../atl/atl-com-desktop-components.md)<br/>
2727
Provides reference material for the ATL Library, a set of template-based C++ classes that simplify the programming of COM objects.
2828

29-
[Microsoft Foundation Class Library (MFC) Reference](../mfc/mfc-desktop-applications.md)
29+
[Microsoft Foundation Class Library (MFC) Reference](../mfc/mfc-desktop-applications.md)<br/>
3030
Provides reference material for the MFC Library, a set of classes in that constitute an application framework, which is the framework of an application written for the Windows API.
3131

32-
[Debugging](/visualstudio/debugger/debugging-in-visual-studio)
32+
[Debugging](/visualstudio/debugger/debugging-in-visual-studio)<br/>
3333
Provides links to using the Visual Studio debugger to correct logic errors in your application or stored procedures.

docs/atl-mfc-shared/basic-cstring-operations.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -97,8 +97,8 @@ Without the cast, `cs` is treated as a `void*` and `wcout` prints the address of
9797

9898
## See Also
9999

100-
[Strings (ATL/MFC)](../atl-mfc-shared/strings-atl-mfc.md)
101-
[CStringT Class](../atl-mfc-shared/reference/cstringt-class.md)
102-
[Template Specialization](../cpp/template-specialization-cpp.md)
100+
[Strings (ATL/MFC)](../atl-mfc-shared/strings-atl-mfc.md)<br/>
101+
[CStringT Class](../atl-mfc-shared/reference/cstringt-class.md)<br/>
102+
[Template Specialization](../cpp/template-specialization-cpp.md)<br/>
103103
[How to: Convert Between Various String Types](../text/how-to-convert-between-various-string-types.md)
104104

0 commit comments

Comments
 (0)