Skip to content

Commit 7e86af2

Browse files
author
mikeblome
committed
local merge
2 parents e530f9d + 18183e6 commit 7e86af2

3,313 files changed

Lines changed: 43894 additions & 44601 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.publish.config.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@
3838
"skip_source_output_uploading": false,
3939
"git_repository_url_open_to_public_contributors": "https://github.com/Microsoft/cpp-docs",
4040
"git_repository_branch_open_to_public_contributors": "master",
41+
"need_preview_pull_request": true,
4142
"dependent_repositories": [
4243
{
4344
"path_to_root": "_themes",

.openpublishing.redirection.json

Lines changed: 549 additions & 0 deletions
Large diffs are not rendered by default.

docs/assembler/arm/arm-assembler-command-line-reference.md

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
1-
---
2-
title: "ARM Assembler Command-Line Reference | Microsoft Docs"
3-
ms.custom: ""
4-
ms.date: "11/04/2016"
5-
ms.reviewer: ""
6-
ms.suite: ""
7-
ms.technology: ["cpp-tools"]
8-
ms.tgt_pltfrm: ""
9-
ms.topic: "article"
10-
dev_langs: ["C++"]
11-
ms.assetid: f7b89478-1ab5-4995-8cde-a805f0462c45
12-
caps.latest.revision: 12
13-
author: "corob-msft"
14-
ms.author: "corob"
15-
manager: "ghogen"
16-
ms.workload: ["cplusplus"]
1+
---
2+
title: "ARM Assembler Command-Line Reference | Microsoft Docs"
3+
ms.custom: ""
4+
ms.date: "11/04/2016"
5+
ms.reviewer: ""
6+
ms.suite: ""
7+
ms.technology: ["cpp-tools"]
8+
ms.tgt_pltfrm: ""
9+
ms.topic: "reference"
10+
dev_langs: ["C++"]
11+
ms.assetid: f7b89478-1ab5-4995-8cde-a805f0462c45
12+
caps.latest.revision: 12
13+
author: "corob-msft"
14+
ms.author: "corob"
15+
manager: "ghogen"
16+
ms.workload: ["cplusplus"]
1717
---
1818
# ARM Assembler Command-Line Reference
1919
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.

docs/assembler/arm/arm-assembler-diagnostic-messages.md

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
1-
---
2-
title: "ARM Assembler Diagnostic Messages | Microsoft Docs"
3-
ms.custom: ""
4-
ms.date: "11/04/2016"
5-
ms.reviewer: ""
6-
ms.suite: ""
7-
ms.technology: ["cpp-tools"]
8-
ms.tgt_pltfrm: ""
9-
ms.topic: "article"
10-
dev_langs: ["C++"]
11-
ms.assetid: 52b38267-6023-4bdc-a0ef-863362f48eec
12-
caps.latest.revision: 6
13-
author: "corob-msft"
14-
ms.author: "corob"
15-
manager: "ghogen"
16-
ms.workload: ["cplusplus"]
1+
---
2+
title: "ARM Assembler Diagnostic Messages | Microsoft Docs"
3+
ms.custom: ""
4+
ms.date: "11/04/2016"
5+
ms.reviewer: ""
6+
ms.suite: ""
7+
ms.technology: ["cpp-tools"]
8+
ms.tgt_pltfrm: ""
9+
ms.topic: "reference"
10+
dev_langs: ["C++"]
11+
ms.assetid: 52b38267-6023-4bdc-a0ef-863362f48eec
12+
caps.latest.revision: 6
13+
author: "corob-msft"
14+
ms.author: "corob"
15+
manager: "ghogen"
16+
ms.workload: ["cplusplus"]
1717
---
1818
# ARM Assembler Diagnostic Messages
1919
The Microsoft ARM assembler (*armasm*) emits diagnostic warnings and errors when it encounters them. This article describes the most commonly-encountered messages.

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

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
1-
---
2-
title: "ARM Assembler Directives | Microsoft Docs"
3-
ms.custom: ""
4-
ms.date: "11/04/2016"
5-
ms.reviewer: ""
6-
ms.suite: ""
7-
ms.technology: ["cpp-tools"]
8-
ms.tgt_pltfrm: ""
9-
ms.topic: "article"
10-
dev_langs: ["C++"]
11-
ms.assetid: 9cfa8896-ec10-4e77-855a-3135c40d7d2a
12-
caps.latest.revision: 5
13-
author: "corob-msft"
14-
ms.author: "corob"
15-
manager: "ghogen"
16-
ms.workload: ["cplusplus"]
1+
---
2+
title: "ARM Assembler Directives | Microsoft Docs"
3+
ms.custom: ""
4+
ms.date: "11/04/2016"
5+
ms.reviewer: ""
6+
ms.suite: ""
7+
ms.technology: ["cpp-tools"]
8+
ms.tgt_pltfrm: ""
9+
ms.topic: "reference"
10+
dev_langs: ["C++"]
11+
ms.assetid: 9cfa8896-ec10-4e77-855a-3135c40d7d2a
12+
caps.latest.revision: 5
13+
author: "corob-msft"
14+
ms.author: "corob"
15+
manager: "ghogen"
16+
ms.workload: ["cplusplus"]
1717
---
1818
# ARM Assembler Directives
1919
For the most part, the Microsoft ARM assembler uses the ARM assembly language, which is documented in Chapter 7 of the [ARM assembler tools guide](http://go.microsoft.com/fwlink/p/?linkid=246102). However, the Microsoft implementations of some assembly directives differ from the ARM assembly directives. This article explains the differences.

docs/assembler/arm/arm-assembler-reference.md

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
1-
---
2-
title: "ARM Assembler Reference | Microsoft Docs"
3-
ms.custom: ""
4-
ms.date: "08/28/2017"
5-
ms.reviewer: ""
6-
ms.suite: ""
7-
ms.technology: ["cpp-tools"]
8-
ms.tgt_pltfrm: ""
9-
ms.topic: "article"
10-
dev_langs: ["C++"]
11-
ms.assetid: f8a076cc-9627-4328-a34a-9c44f7a3aab1
12-
caps.latest.revision: 13
13-
author: "corob-msft"
14-
ms.author: "corob"
15-
manager: "ghogen"
16-
ms.workload: ["cplusplus"]
1+
---
2+
title: "ARM Assembler Reference | Microsoft Docs"
3+
ms.custom: ""
4+
ms.date: "08/28/2017"
5+
ms.reviewer: ""
6+
ms.suite: ""
7+
ms.technology: ["cpp-tools"]
8+
ms.tgt_pltfrm: ""
9+
ms.topic: "reference"
10+
dev_langs: ["C++"]
11+
ms.assetid: f8a076cc-9627-4328-a34a-9c44f7a3aab1
12+
caps.latest.revision: 13
13+
author: "corob-msft"
14+
ms.author: "corob"
15+
manager: "ghogen"
16+
ms.workload: ["cplusplus"]
1717
---
1818
# ARM Assembler Reference
1919

docs/assembler/arm/index.md

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

docs/assembler/index.md

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

docs/assembler/inline/index.md

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

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

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
1-
---
2-
title: "Instruction Set for Inline Assembly | Microsoft Docs"
3-
ms.custom: ""
4-
ms.date: "11/04/2016"
5-
ms.reviewer: ""
6-
ms.suite: ""
7-
ms.technology: ["cpp-tools"]
8-
ms.tgt_pltfrm: ""
9-
ms.topic: "article"
10-
dev_langs: ["C++"]
11-
helpviewer_keywords: ["inline assembly [C++], instruction set", "instruction set [C++], inline assembly", "assembler [C++], instruction set", "instruction set [C++]"]
12-
ms.assetid: a45b5b22-9b5f-4545-81ec-70eb8ea2ef9b
13-
caps.latest.revision: 8
14-
author: "corob-msft"
15-
ms.author: "corob"
16-
manager: "ghogen"
17-
ms.workload: ["cplusplus"]
1+
---
2+
title: "Instruction Set for Inline Assembly | Microsoft Docs"
3+
ms.custom: ""
4+
ms.date: "11/04/2016"
5+
ms.reviewer: ""
6+
ms.suite: ""
7+
ms.technology: ["cpp-tools"]
8+
ms.tgt_pltfrm: ""
9+
ms.topic: "reference"
10+
dev_langs: ["C++"]
11+
helpviewer_keywords: ["inline assembly [C++], instruction set", "instruction set [C++], inline assembly", "assembler [C++], instruction set", "instruction set [C++]"]
12+
ms.assetid: a45b5b22-9b5f-4545-81ec-70eb8ea2ef9b
13+
caps.latest.revision: 8
14+
author: "corob-msft"
15+
ms.author: "corob"
16+
manager: "ghogen"
17+
ms.workload: ["cplusplus"]
1818
---
1919
# Instruction Set for Inline Assembly
2020
## Microsoft Specific

0 commit comments

Comments
 (0)