Skip to content

Commit f91f197

Browse files
author
mikeblome
committed
resolved merge conflicts
2 parents d833b43 + 1e74725 commit f91f197

168 files changed

Lines changed: 2156 additions & 1753 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.

‎.acrolinx-config.edn‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
{:allowed-branchname-matches ["^master$" "^release..*"]
2+
:allowed-filename-matches ["docs" "styleguide"]}

‎.openpublishing.redirection.json‎

Lines changed: 199 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -675,6 +675,195 @@
675675
"redirect_url": "/cpp/build/reference/creating-precompiled-header-files#when-to-precompile-source-code",
676676
"redirect_document_id": false
677677
},
678+
679+
{
680+
"source_path": "docs/build/calling-convention.md",
681+
"redirect_url": "/cpp/build/x64-calling-convention",
682+
"redirect_document_id": true
683+
},
684+
{
685+
"source_path": "docs/build/parameter-passing.md",
686+
"redirect_url": "/cpp/build/x64-calling-convention#parameter-passing",
687+
"redirect_document_id": false
688+
},
689+
{
690+
"source_path": "docs/build/varargs.md",
691+
"redirect_url": "/cpp/build/x64-calling-convention#varargs",
692+
"redirect_document_id": false
693+
},
694+
{
695+
"source_path": "docs/build/unprototyped-functions.md",
696+
"redirect_url": "/cpp/build/x64-calling-convention#unprototyped-functions",
697+
"redirect_document_id": false
698+
},
699+
{
700+
"source_path": "docs/build/return-values-cpp.md",
701+
"redirect_url": "/cpp/build/x64-calling-convention#return-values",
702+
"redirect_document_id": false
703+
},
704+
{
705+
"source_path": "docs/build/caller-callee-saved-registers.md",
706+
"redirect_url": "/cpp/build/x64-calling-convention#callercallee-saved-registers",
707+
"redirect_document_id": false
708+
},
709+
{
710+
"source_path": "docs/build/function-pointers.md",
711+
"redirect_url": "/cpp/build/x64-calling-convention#function-pointers",
712+
"redirect_document_id": false
713+
},
714+
{
715+
"source_path": "docs/build/floating-point-support-for-older-code-visual-cpp.md",
716+
"redirect_url": "/cpp/build/x64-calling-convention#floating-point-support-for-older-code",
717+
"redirect_document_id": false
718+
},
719+
{
720+
"source_path": "docs/build/fpcsr.md",
721+
"redirect_url": "/cpp/build/x64-calling-convention#fpcsr",
722+
"redirect_document_id": false
723+
},
724+
{
725+
"source_path": "docs/build/mxcsr.md",
726+
"redirect_url": "/cpp/build/x64-calling-convention#mxcsr",
727+
"redirect_document_id": false
728+
},
729+
{
730+
"source_path": "docs/build/setjmp-longjump.md",
731+
"redirect_url": "/cpp/build/x64-calling-convention#setjmplongjmp",
732+
"redirect_document_id": false
733+
},
734+
735+
{
736+
"source_path": "docs/build/overview-of-x64-calling-conventions.md",
737+
"redirect_url": "/cpp/build/x64-software-conventions#overview-of-x64-calling-conventions",
738+
"redirect_document_id": false
739+
},
740+
{
741+
"source_path": "docs/build/types-and-storage.md",
742+
"redirect_url": "/cpp/build/x64-software-conventions#types-and-storage",
743+
"redirect_document_id": false
744+
},
745+
{
746+
"source_path": "docs/build/scalar-types.md",
747+
"redirect_url": "/cpp/build/x64-software-conventions#scalar-types",
748+
"redirect_document_id": false
749+
},
750+
{
751+
"source_path": "docs/build/aggregates-and-unions.md",
752+
"redirect_url": "/cpp/build/x64-software-conventions#aggregates-and-unions",
753+
"redirect_document_id": false
754+
},
755+
{
756+
"source_path": "docs/build/examples-of-structure-alignment.md",
757+
"redirect_url": "/cpp/build/x64-software-conventions#examples-of-structure-alignment",
758+
"redirect_document_id": false
759+
},
760+
{
761+
"source_path": "docs/build/bitfields.md",
762+
"redirect_url": "/cpp/build/x64-software-conventions#bitfields",
763+
"redirect_document_id": false
764+
},
765+
{
766+
"source_path": "docs/build/conflicts-with-the-x86-compiler.md",
767+
"redirect_url": "/cpp/build/x64-software-conventions#conflicts-with-the-x86-compiler",
768+
"redirect_document_id": false
769+
},
770+
{
771+
"source_path": "docs/build/register-usage.md",
772+
"redirect_url": "/cpp/build/x64-software-conventions#register-usage",
773+
"redirect_document_id": false
774+
},
775+
{
776+
"source_path": "docs/build/intrinsics-and-inline-assembly.md",
777+
"redirect_url": "/cpp/build/x64-software-conventions#intrinsics-and-inline-assembly",
778+
"redirect_document_id": false
779+
},
780+
{
781+
"source_path": "docs/build/image-format.md",
782+
"redirect_url": "/cpp/build/x64-software-conventions#image-format",
783+
"redirect_document_id": false
784+
},
785+
786+
{
787+
"source_path": "docs/build/stack-allocation.md",
788+
"redirect_url": "/cpp/build/stack-usage#stack-allocation",
789+
"redirect_document_id": false
790+
},
791+
{
792+
"source_path": "docs/build/dynamic-parameter-stack-area-construction.md",
793+
"redirect_url": "/cpp/build/stack-usage#dynamic-parameter-stack-area-construction",
794+
"redirect_document_id": false
795+
},
796+
{
797+
"source_path": "docs/build/function-types.md",
798+
"redirect_url": "/cpp/build/stack-usage#function-types",
799+
"redirect_document_id": false
800+
},
801+
{
802+
"source_path": "docs/build/malloc-alignment.md",
803+
"redirect_url": "/cpp/build/stack-usage#malloc-alignment",
804+
"redirect_document_id": false
805+
},
806+
{
807+
"source_path": "docs/build/alloca.md",
808+
"redirect_url": "/cpp/build/stack-usage#alloca",
809+
"redirect_document_id": false
810+
},
811+
812+
{
813+
"source_path": "docs/build/unwind-data-for-exception-handling-debugger-support.md",
814+
"redirect_url": "/cpp/build/exception-handling-x64#unwind-data-for-exception-handling-debugger-support",
815+
"redirect_document_id": false
816+
},
817+
{
818+
"source_path": "docs/build/struct-runtime-function.md",
819+
"redirect_url": "/cpp/build/exception-handling-x64#struct-runtime_function",
820+
"redirect_document_id": false
821+
},
822+
{
823+
"source_path": "docs/build/struct-unwind-code.md",
824+
"redirect_url": "/cpp/build/exception-handling-x64#struct-unwind_code",
825+
"redirect_document_id": false
826+
},
827+
{
828+
"source_path": "docs/build/struct-unwind-info.md",
829+
"redirect_url": "/cpp/build/exception-handling-x64#struct-unwind_info",
830+
"redirect_document_id": false
831+
},
832+
{
833+
"source_path": "docs/build/chained-unwind-info-structures.md",
834+
"redirect_url": "/cpp/build/exception-handling-x64#chained-unwind-info-structures",
835+
"redirect_document_id": false
836+
},
837+
{
838+
"source_path": "docs/build/unwind-procedure.md",
839+
"redirect_url": "/cpp/build/exception-handling-x64#unwind-procedure",
840+
"redirect_document_id": false
841+
},
842+
{
843+
"source_path": "docs/build/language-specific-handler.md",
844+
"redirect_url": "/cpp/build/exception-handling-x64#language-specific-handler",
845+
"redirect_document_id": false
846+
},
847+
{
848+
"source_path": "docs/build/unwind-helpers-for-masm.md",
849+
"redirect_url": "/cpp/build/exception-handling-x64#unwind-helpers-for-masm",
850+
"redirect_document_id": false
851+
},
852+
{
853+
"source_path": "docs/build/raw-pseudo-operations.md",
854+
"redirect_url": "/cpp/build/exception-handling-x64#raw-pseudo-operations",
855+
"redirect_document_id": false
856+
},
857+
{
858+
"source_path": "docs/build/masm-macros.md",
859+
"redirect_url": "/cpp/build/exception-handling-x64#masm-macros",
860+
"redirect_document_id": false
861+
},
862+
{
863+
"source_path": "docs/build/unwind-data-definitions-in-c.md",
864+
"redirect_url": "/cpp/build/exception-handling-x64#unwind-data-definitions-in-c",
865+
"redirect_document_id": false
866+
},
678867
{
679868
"source_path": "docs/c-language/index.md",
680869
"redirect_url": "/cpp/c-language/c-language-reference",
@@ -3360,6 +3549,11 @@
33603549
"redirect_url": "/cpp/dotnet/pure-and-verifiable-code-cpp-cli",
33613550
"redirect_document_id": false
33623551
},
3552+
{
3553+
"source_path": "docs/dotnet/mixed-pure-and-verifiable-feature-comparison-cpp-cli.md",
3554+
"redirect_url": "/cpp/dotnet/pure-and-verifiable-code-cpp-cli",
3555+
"redirect_document_id": false
3556+
},
33633557
{
33643558
"source_path": "docs/dotnet/greater-equal-stl-clr.md",
33653559
"redirect_url": "/cpp/dotnet/functional-stl-clr#greater_equal",
@@ -7395,6 +7589,11 @@
73957589
"redirect_url": "/cpp/parallel/amp/reference/reference-cpp-amp",
73967590
"redirect_document_id": false
73977591
},
7592+
{
7593+
"source_path": "docs/parallel/concrt/convert-an-openmp-loop-that uses-exception-handling.md",
7594+
"redirect_url": "/cpp/parallel/concrt/convert-an-openmp-loop-that-uses-exception-handling",
7595+
"redirect_document_id": true
7596+
},
73987597
{
73997598
"source_path": "docs/parallel/concrt/index.md",
74007599
"redirect_url": "/cpp/parallel/concrt/concurrency-runtime",

‎docs/assembler/masm/align-masm.md‎

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,27 @@
11
---
22
title: "ALIGN (MASM)"
3-
ms.date: "08/30/2018"
3+
ms.date: "01/02/2019"
44
f1_keywords: ["align"]
55
helpviewer_keywords: ["ALIGN directive"]
66
ms.assetid: 1c386b23-439f-4ec3-a6de-74427b25e47f
77
---
88
# ALIGN (MASM)
99

10-
Aligns the next variable or instruction on a byte that is a multiple of *number*.
10+
The **ALIGN** directive aligns the next data element or instruction on an address that is a multiple of its parameter. The parameter must be a power of 2 (for example, 1, 2, 4, and so on) that is less than or equal to the segment alignment.
1111

1212
## Syntax
1313

1414
> ALIGN [[*number*]]
1515
16+
## Remarks
17+
18+
The **ALIGN** directive allows you to specify the beginning offset of a data element or an instruction. Aligned data can improve performance, at the expense of wasted space between data elements. Large performance improvements can be seen when data accesses are on boundaries that fit within cache lines. Accesses on natural boundaries for native types means less time spent in internal hardware realignment microcode.
19+
20+
The need for aligned instructions is rare on modern processors that use a flat addressing model, but may be required for jump targets in older code for other addressing models.
21+
22+
When data is aligned, the skipped space is padded with zeroes. When instructions are aligned, the skipped space is filled with appropriately-sized NOP instructions.
23+
1624
## See also
1725

26+
[EVEN](even.md)<br/>
1827
[Directives Reference](../../assembler/masm/directives-reference.md)<br/>

‎docs/build/TOC.md‎

Lines changed: 11 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -103,53 +103,17 @@
103103
### [Manifest Generation at the Command Line](manifest-generation-at-the-command-line.md)
104104
### [How to: Embed a Manifest Inside a C/C++ Application](how-to-embed-a-manifest-inside-a-c-cpp-application.md)
105105
## [Troubleshooting C/C++ Isolated Applications and Side-by-side Assemblies](troubleshooting-c-cpp-isolated-applications-and-side-by-side-assemblies.md)
106-
# [Configure C++ projects for 64-bit, x64 targets](configuring-programs-for-64-bit-visual-cpp.md)
107-
## [How to: Configure C++ Projects to Target 64-Bit, x64 Platforms](how-to-configure-visual-cpp-projects-to-target-64-bit-platforms.md)
108-
## [How to: Enable a 64-Bit C++ Toolset on the Command Line](how-to-enable-a-64-bit-visual-cpp-toolset-on-the-command-line.md)
109-
## [Common C++ 64-bit Migration Issues](common-visual-cpp-64-bit-migration-issues.md)
110-
## [x64 Software Conventions](x64-software-conventions.md)
111-
### [Overview of x64 Calling Conventions](overview-of-x64-calling-conventions.md)
112-
### [Types and Storage](types-and-storage.md)
113-
#### [Scalar Types](scalar-types.md)
114-
#### [Aggregates and Unions](aggregates-and-unions.md)
115-
#### [Examples of Structure Alignment](examples-of-structure-alignment.md)
116-
#### [Bitfields](bitfields.md)
117-
#### [Conflicts with the x86 Compiler](conflicts-with-the-x86-compiler.md)
118-
### [Register Usage](register-usage.md)
119-
### [Calling Convention](calling-convention.md)
120-
#### [Parameter Passing](parameter-passing.md)
121-
#### [Varargs](varargs.md)
122-
#### [Unprototyped Functions](unprototyped-functions.md)
123-
#### [Return Values (C++)](return-values-cpp.md)
124-
#### [Caller-Callee Saved Registers](caller-callee-saved-registers.md)
125-
#### [Function Pointers](function-pointers.md)
126-
#### [Floating-Point Support for Older Code (C++)](floating-point-support-for-older-code-visual-cpp.md)
127-
#### [FpCsr](fpcsr.md)
128-
#### [MxCsr](mxcsr.md)
129-
#### [setjmp-longjump](setjmp-longjump.md)
130-
### [Stack Usage](stack-usage.md)
131-
#### [Stack Allocation](stack-allocation.md)
132-
#### [Dynamic Parameter Stack Area Construction](dynamic-parameter-stack-area-construction.md)
133-
#### [Function Types](function-types.md)
134-
#### [malloc Alignment](malloc-alignment.md)
135-
#### [alloca](alloca.md)
136-
### [Prolog and Epilog](prolog-and-epilog.md)
137-
### [Exception Handling (x64)](exception-handling-x64.md)
138-
#### [Unwind Data for Exception Handling, Debugger Support](unwind-data-for-exception-handling-debugger-support.md)
139-
##### [struct RUNTIME_FUNCTION](struct-runtime-function.md)
140-
##### [struct UNWIND_INFO](struct-unwind-info.md)
141-
##### [struct UNWIND_CODE](struct-unwind-code.md)
142-
##### [Chained Unwind Info Structures](chained-unwind-info-structures.md)
143-
#### [Unwind Procedure](unwind-procedure.md)
144-
#### [Language Specific Handler](language-specific-handler.md)
145-
#### [Unwind Helpers for MASM](unwind-helpers-for-masm.md)
146-
##### [Raw Pseudo Operations](raw-pseudo-operations.md)
147-
##### [MASM Macros](masm-macros.md)
148-
#### [Unwind Data Definitions in C](unwind-data-definitions-in-c.md)
149-
### [Intrinsics and Inline Assembly](intrinsics-and-inline-assembly.md)
150-
### [Image Format](image-format.md)
151-
# [Configure C++ for ARM processors](configuring-programs-for-arm-processors-visual-cpp.md)
152-
## [Common C++ ARM Migration Issues](common-visual-cpp-arm-migration-issues.md)
106+
# [Configure Visual C++ for 64-bit, x64 targets](configuring-programs-for-64-bit-visual-cpp.md)
107+
## [How to: Configure Visual C++ Projects to Target 64-Bit, x64 Platforms](how-to-configure-visual-cpp-projects-to-target-64-bit-platforms.md)
108+
## [How to: Enable a 64-Bit Visual C++ Toolset on the Command Line](how-to-enable-a-64-bit-visual-cpp-toolset-on-the-command-line.md)
109+
## [Common Visual C++ 64-bit Migration Issues](common-visual-cpp-64-bit-migration-issues.md)
110+
## [x64 software conventions](x64-software-conventions.md)
111+
### [x64 calling convention](x64-calling-convention.md)
112+
### [x64 stack usage](stack-usage.md)
113+
### [x64 prolog and epilog](prolog-and-epilog.md)
114+
### [x64 exception handling](exception-handling-x64.md)
115+
# [Configure Visual C++ for ARM processors](configuring-programs-for-arm-processors-visual-cpp.md)
116+
## [Common Visual C++ ARM Migration Issues](common-visual-cpp-arm-migration-issues.md)
153117
## [Overview of ARM ABI Conventions](overview-of-arm-abi-conventions.md)
154118
## [Overview of ARM64 ABI Conventions](arm64-windows-abi-conventions.md)
155119
## [ARM Exception Handling](arm-exception-handling.md)

‎docs/build/aggregates-and-unions.md‎

Lines changed: 0 additions & 56 deletions
This file was deleted.

‎docs/build/alloca.md‎

Lines changed: 0 additions & 15 deletions
This file was deleted.

0 commit comments

Comments
 (0)