Skip to content

Commit d649186

Browse files
author
Colin Robertson
committed
Correct a few mistakes
1 parent 416ddab commit d649186

5 files changed

Lines changed: 39 additions & 36 deletions

File tree

docs/assembler/masm/TOC.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -201,9 +201,9 @@
201201
## [Operators Reference](operators-reference.md)
202202
### [Operators (MASM)](operators-masm.md)
203203
#### [operator +](operator-add.md)
204-
#### [operator -2](operator-subtract-2.md)
204+
#### [operator -](operator-subtract-2.md)
205205
#### [operator *](operator-multiply.md)
206-
#### [operator -1](operator-subtract-1.md)
206+
#### [operator /](operator-subtract-1.md)
207207
#### [operator []](operator-brackets.md)
208208
#### [operator :](operator-colon.md)
209209
#### [operator .](operator-dot.md)
@@ -214,7 +214,7 @@
214214
#### [operator ;](operator-semicolon.md)
215215
#### [operator ;;](operator-semicolons.md)
216216
#### [operator %](operator-percent.md)
217-
#### [operator &&](operator-logical-and-masm.md)
217+
#### [operator & &](operator-logical-and-masm.md)
218218
#### [operator ABS](operator-abs.md)
219219
#### [operator ADDR](operator-addr.md)
220220
#### [operator AND](operator-and.md)

docs/assembler/masm/operator-add.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,12 @@ ms.workload: ["cplusplus"]
1414
---
1515
# operator +
1616

17-
The first operator returns *expression1* plus *expression2*. The second operator reverses the sign of *expression*.
17+
The first operator returns *expression1* plus *expression2*.
1818

1919
## Syntax
2020

2121
> *expression1* + *expression2*
2222
23-
> -*expression*
24-
2523
## See also
2624

2725
[Operators Reference](../../assembler/masm/operators-reference.md)<br/>

docs/assembler/masm/operator-subtract-1.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
title: "operator -1 | Microsoft Docs"
2+
title: "operator / | Microsoft Docs"
33
ms.custom: ""
44
ms.date: "08/30/2018"
55
ms.technology: ["cpp-masm"]

docs/assembler/masm/operator-subtract-2.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
title: "operator -2 | Microsoft Docs"
2+
title: "operator - | Microsoft Docs"
33
ms.custom: ""
44
ms.date: "08/30/2018"
55
ms.technology: ["cpp-masm"]
@@ -14,12 +14,14 @@ ms.workload: ["cplusplus"]
1414
---
1515
# operator -
1616

17-
Returns *expression1* minus *expression2*.
17+
Returns *expression1* minus *expression2*. The second operator reverses the sign of *expression*.
1818

1919
## Syntax
2020

2121
> expression1 - expression2
2222
23+
> -*expression*
24+
2325
## See also
2426

2527
[Operators Reference](../../assembler/masm/operators-reference.md)<br/>

docs/assembler/masm/operators-reference.md

Lines changed: 30 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -17,73 +17,76 @@ ms.workload: ["cplusplus"]
1717

1818
||||
1919
|-|-|-|
20-
|[*](../../assembler/masm/operator-multiply.md)|[+](../../assembler/masm/operator-add.md)|[-](../../assembler/masm/operator-subtract-2.md)|
21-
|[.](../../assembler/masm/operator-dot.md)|[/](../../assembler/masm/operator-subtract-1.md)|[&#91;&#93;](../../assembler/masm/operator-brackets.md)|
22-
|[MOD](../../assembler/masm/operator-mod.md)|||
20+
|[* (multiply)](operator-multiply.md)|[+ (add)](operator-add.md)|[- (subtract or negate)](operator-subtract-2.md)|
21+
|[. (field)](operator-dot.md)|[/ (divide)](operator-subtract-1.md)|[&#91;&#93; (index)](operator-brackets.md)|
22+
|[MOD (remainder)](operator-mod.md)|||
2323

2424
## Control Flow
2525

2626
||||
2727
|-|-|-|
28-
|[!](../../assembler/masm/operator-logical-not-masm.md)|[!=](../../assembler/masm/operator-not-equal-masm.md)|[&](../../assembler/masm/operator-logical-and-masm.md)|
29-
|[&&](../../assembler/masm/operator-logical-and-masm-run-time.md)|[<](../../assembler/masm/operator-less-than-masm-run-time.md)|[\<=](../../assembler/masm/operator-less-or-equal-masm-run-time.md)|
30-
|[==](../../assembler/masm/operator-equal-masm-run-time.md)|[>](../../assembler/masm/operator-greater-than-masm-run-time.md)|[>=](../../assembler/masm/operator-greater-or-equal-masm-run-time.md)|
31-
|[&#124;&#124;](../../assembler/masm/operator-logical-or.md)|||
28+
|[! (runtime logical not)](operator-logical-not-masm-run-time.md)|[!= (runtime not equal)](operator-not-equal-masm.md)|[&#124;&#124; (runtime logical or)](operator-logical-or.md)|
29+
|[&& (runtime logical and)](operator-logical-and-masm-run-time.md)|[< (runtime less than)](operator-less-than-masm-run-time.md)|[\<= (runtime less or equal)](operator-less-or-equal-masm-run-time.md)|
30+
|[== (runtime equal)](operator-equal-masm-run-time.md)|[> (runtime greater than)](operator-greater-than-masm-run-time.md)|[>= (runtime greater or equal)](operator-greater-or-equal-masm-run-time.md)|
31+
|[& (runtime bitwise and)](operator-bitwise-and.md)|||
32+
|[CARRY? (runtime carry test)](operator-carry-q.md)|[OVERFLOW? (runtime overflow test)](operator-overflow-q.md)|[PARITY? (runtime parity test)](operator-parity-q.md)|
33+
|[SIGN? (runtime sign test)](operator-sign-q.md)|[ZERO? (runtime zero test)](operator-zero-q.md)||
3234

3335
## Logical and Shift
3436

3537
||||
3638
|-|-|-|
37-
|[AND](../../assembler/masm/operator-and.md)|[NOT](../../assembler/masm/operator-not.md)|[OR](../../assembler/masm/operator-or.md)|
38-
|[SHL](../../assembler/masm/operator-shl.md)|[SHR](../../assembler/masm/operator-shr.md)|[XOR](../../assembler/masm/operator-xor.md)|
39+
|[AND (bitwise and)](operator-and.md)|[NOT (bitwise not)](operator-not.md)|[OR (bitwise or)](operator-or.md)|
40+
|[SHL (shift bits left)](operator-shl.md)|[SHR (shift bits right)](operator-shr.md)|[XOR (bitwise exclusive or)](operator-xor.md)|
3941

4042
## Macro
4143

4244
||||
4345
|-|-|-|
44-
|[!](../../assembler/masm/operator-logical-not-masm-run-time.md)|[%](../../assembler/masm/operator-percent.md)|[&](../../assembler/masm/operator-bitwise-and.md)|
45-
|[;;](../../assembler/masm/operator-semicolons.md)|[<>](../../assembler/masm/operator-literal.md)||
46+
|[! (character literal)](operator-logical-not-masm.md)|[% (treat as text)](operator-percent.md)||
47+
|[;; (treat as comment)](operator-semicolons.md)|[&lt; &gt; (treat as one literal)](operator-literal.md)|[& & (substitute parameter value)](operator-logical-and-masm.md)|
4648

4749
## Miscellaneous
4850

4951
||||
5052
|-|-|-|
51-
|[' '](../../assembler/masm/operator-single-quote.md)|[" "](../../assembler/masm/operator-double-quote.md)|[:](../../assembler/masm/operator-colon.md)|
52-
|[::](../../assembler/masm/operator-semicolons.md)|[;](../../assembler/masm/operator-semicolon.md)|[CARRY?](../../assembler/masm/operator-carry-q.md)|
53-
|[DUP](../../assembler/masm/operator-dup.md)|[OVERFLOW?](../../assembler/masm/operator-overflow-q.md)|[PARITY?](../../assembler/masm/operator-parity-q.md)|
54-
|[SIGN?](../../assembler/masm/operator-sign-q.md)|[ZERO?](../../assembler/masm/operator-zero-q.md)||
53+
|[' ' (treat as string)](operator-single-quote.md)|[" " (treat as string)](operator-double-quote.md)||
54+
|: (local label definition)|:: (register segment and offset)|:: (global label definition)|
55+
|[; (treat as comment)](operator-semicolon.md)|[DUP (repeat declaration)](operator-dup.md)||
5556

5657
## Record
5758

5859
|||
5960
|-|-|
60-
|[MASK](../../assembler/masm/operator-mask.md)|[WIDTH](../../assembler/masm/operator-width.md)|
61+
|[MASK (get record or field bitmask)](operator-mask.md)|[WIDTH (get record or field width)](operator-width.md)|
6162

6263
## Relational
6364

6465
||||
6566
|-|-|-|
66-
|[EQ](../../assembler/masm/operator-eq.md)|[GE](../../assembler/masm/operator-ge.md)|[GT](../../assembler/masm/operator-gt.md)|
67-
|[LE](../../assembler/masm/operator-le.md)|[LT](../../assembler/masm/operator-lt.md)|[NE](../../assembler/masm/operator-ne.md)|
67+
|[EQ (equal)](operator-eq.md)|[GE (greater or equal)](operator-ge.md)|[GT (greater than)](operator-gt.md)|
68+
|[LE (less or equal)](operator-le.md)|[LT (less than)](operator-lt.md)|[NE (not equal)](operator-ne.md)|
6869

6970
## Segment
7071

7172
|||
7273
|-|-|
73-
|[:](../../assembler/masm/operator-colon.md)|[IMAGEREL](../../assembler/masm/operator-imagerel.md)|
74-
|[LROFFSET](../../assembler/masm/operator-lroffset.md)|[OFFSET](../../assembler/masm/operator-offset.md)|
75-
|[SECTIONREL](../../assembler/masm/operator-sectionrel.md)|[SEG](../../assembler/masm/operator-seg.md)|
74+
|[: (segment override)](operator-colon.md)|:: (register segment and offset)|
75+
|[IMAGEREL (image relative offset)](operator-imagerel.md)|[LROFFSET (loader resolved offset)](operator-lroffset.md)|
76+
|[OFFSET (segment relative offset)](operator-offset.md)|[SECTIONREL (section relative offset)](operator-sectionrel.md)|
77+
|[SEG (get segment)](operator-seg.md)||
7678

7779
## Type
7880

7981
||||
8082
|-|-|-|
81-
|[HIGH](../../assembler/masm/operator-high.md)|[HIGH32](../../assembler/masm/operator-high32.md)|[HIGHWORD](../../assembler/masm/operator-highword.md)|
82-
|[LENGTH](../../assembler/masm/operator-length.md)|[LENGTHOF](../../assembler/masm/operator-lengthof.md)|[LOW](../../assembler/masm/operator-low.md)|
83-
|[LOW32](../../assembler/masm/operator-low32.md)|[LOWWORD](../../assembler/masm/operator-lowword.md)|[OPATTR](../../assembler/masm/operator-opattr.md)|
84-
|[PTR](../../assembler/masm/operator-ptr.md)|[SHORT](../../assembler/masm/operator-short.md)|[SIZE](../../assembler/masm/operator-size.md)|
85-
|[SIZEOF](../../assembler/masm/operator-sizeof.md)|[THIS](../../assembler/masm/operator-this.md)|[TYPE](../../assembler/masm/operator-type.md)|
83+
|[HIGH (high 8 bits of lowest 16 bits)](operator-high.md)|[HIGH32 (high 32 bits of 64 bits)](operator-high32.md)|[HIGHWORD (high 16 bits of lowest 32 bits)](operator-highword.md)|
84+
|[LENGTH (number of elements in array)](operator-length.md)|[LENGTHOF (number of elements in array)](operator-lengthof.md)|[LOW (low 8 bits)](operator-low.md)|
85+
|[LOW32 (low 32 bits)](operator-low32.md)|[LOWWORD (low 16 bits)](operator-lowword.md)|[OPATTR (get argument type info)](operator-opattr.md)|
86+
|[PTR (pointer to or as type)](operator-ptr.md)|[SHORT (mark short label type)](operator-short.md)|[SIZE (size of type or variable)](operator-size.md)|
87+
|[SIZEOF (size of type or variable)](operator-sizeof.md)|[THIS (current location)](operator-this.md)|[TYPE (get expression type)](operator-type.md)|
88+
|[.TYPE (get argument type info)](operator-dot-type.md)|||
8689

8790
## See also
8891

89-
[Microsoft Macro Assembler Reference](../../assembler/masm/microsoft-macro-assembler-reference.md)<br/>
92+
[Microsoft Macro Assembler Reference](microsoft-macro-assembler-reference.md)<br/>

0 commit comments

Comments
 (0)