Skip to content

Commit bcdb3fc

Browse files
soypatdeadprogram
authored andcommitted
fix go:noinlines in volatile package
1 parent b7b23ac commit bcdb3fc

File tree

3 files changed

+8
-8
lines changed

3 files changed

+8
-8
lines changed

src/examples/ram-func/main.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ func in_ram() uintptr {
8383
return device.AsmFull("MOV {}, PC", nil)
8484
}
8585

86-
// go:noinline used here to prevent function being 'inlined' into main()
86+
// 'go:noinline' used here to prevent function being 'inlined' into main()
8787
// so it appears in objdump output. In normal use, go:inline is not
8888
// required for functions running from flash (flash is the default).
8989
//

src/runtime/volatile/bitband_nxpmk66f18.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ func (r *BitRegister) Set(v bool) {
5151
// if R is not an AIPS or GPIO register or if N is out of range (greater than
5252
// the number of bits in a register minus one).
5353
//
54-
// go:inline
54+
//go:inline
5555
func (r *Register8) Bit(bit uint8) *BitRegister {
5656
ptr := bitbandAddress(uintptr(unsafe.Pointer(&r.Reg)), bit)
5757
return (*BitRegister)(unsafe.Pointer(ptr))
@@ -61,7 +61,7 @@ func (r *Register8) Bit(bit uint8) *BitRegister {
6161
// if R is not an AIPS or GPIO register or if N is out of range (greater than
6262
// the number of bits in a register minus one).
6363
//
64-
// go:inline
64+
//go:inline
6565
func (r *Register16) Bit(bit uint8) *BitRegister {
6666
ptr := bitbandAddress(uintptr(unsafe.Pointer(&r.Reg)), bit)
6767
return (*BitRegister)(unsafe.Pointer(ptr))
@@ -71,7 +71,7 @@ func (r *Register16) Bit(bit uint8) *BitRegister {
7171
// if R is not an AIPS or GPIO register or if N is out of range (greater than
7272
// the number of bits in a register minus one).
7373
//
74-
// go:inline
74+
//go:inline
7575
func (r *Register32) Bit(bit uint8) *BitRegister {
7676
ptr := bitbandAddress(uintptr(unsafe.Pointer(&r.Reg)), bit)
7777
return (*BitRegister)(unsafe.Pointer(ptr))

src/runtime/volatile/register.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ func (r *Register8) HasBits(value uint8) bool {
6262
//
6363
// r.Reg = (r.Reg & ^(mask << pos)) | value << pos
6464
//
65-
// go:inline
65+
//go:inline
6666
func (r *Register8) ReplaceBits(value uint8, mask uint8, pos uint8) {
6767
StoreUint8(&r.Reg, LoadUint8(&r.Reg)&^(mask<<pos)|value<<pos)
6868
}
@@ -124,7 +124,7 @@ func (r *Register16) HasBits(value uint16) bool {
124124
//
125125
// r.Reg = (r.Reg & ^(mask << pos)) | value << pos
126126
//
127-
// go:inline
127+
//go:inline
128128
func (r *Register16) ReplaceBits(value uint16, mask uint16, pos uint8) {
129129
StoreUint16(&r.Reg, LoadUint16(&r.Reg)&^(mask<<pos)|value<<pos)
130130
}
@@ -186,7 +186,7 @@ func (r *Register32) HasBits(value uint32) bool {
186186
//
187187
// r.Reg = (r.Reg & ^(mask << pos)) | value << pos
188188
//
189-
// go:inline
189+
//go:inline
190190
func (r *Register32) ReplaceBits(value uint32, mask uint32, pos uint8) {
191191
StoreUint32(&r.Reg, LoadUint32(&r.Reg)&^(mask<<pos)|value<<pos)
192192
}
@@ -248,7 +248,7 @@ func (r *Register64) HasBits(value uint64) bool {
248248
//
249249
// r.Reg = (r.Reg & ^(mask << pos)) | value << pos
250250
//
251-
// go:inline
251+
//go:inline
252252
func (r *Register64) ReplaceBits(value uint64, mask uint64, pos uint8) {
253253
StoreUint64(&r.Reg, LoadUint64(&r.Reg)&^(mask<<pos)|value<<pos)
254254
}

0 commit comments

Comments
 (0)