Delete redundant DivMod implementation#45652

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jkotas merged 2 commits into from
Dec 6, 2020
Merged

Delete redundant DivMod implementation #45652

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fb265eb
Delete redundant DivMod implementation
jkotas Dec 6, 2020
2b97fb9
Feedback
jkotas Dec 6, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 0 additions & 26 deletions ...braries/System.Private.CoreLib/src/System/Buffers/Text/Utf8Formatter/FormattingHelpers.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -149,32 +149,6 @@ public static void WriteTwoDecimalDigits(uint value, Span<byte> buffer, int star

#endregion UTF-8 Helper methods

#region Math Helper methods

/// <summary>
/// We don't have access to Math.DivRem, so this is a copy of the implementation.
/// </summary>
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public static ulong DivMod(ulong numerator, ulong denominator, out ulong modulo)
{
ulong div = numerator / denominator;
modulo = numerator - (div * denominator);
return div;
}

/// <summary>
/// We don't have access to Math.DivRem, so this is a copy of the implementation.

@am11am11Dec 6, 2020

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Another one with similar comment about this helper:

runtime/src/libraries/System.Text.Json/src/System/Text/Json/Writer/JsonWriterHelper.Date.cs

Lines 135 to 138 in ea35f6a

// We don't have access to System.Buffers.Text.FormattingHelpers.DivMod,
// so this is a copy of the implementation.
[MethodImpl(MethodImplOptions.AggressiveInlining)]
privatestaticuintDivMod(uintnumerator,uintdenominator,outuintmodulo)

@jkotasjkotasDec 6, 2020

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

System.Text.Json is compiled downlevel, so it would need ifdefs

@am11am11Dec 6, 2020

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

True, maybe comment can be updated since there is no System.Buffers.Text.FormattingHelpers.DivMod after this change.

/// </summary>
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public static uint DivMod(uint numerator, uint denominator, out uint modulo)
{
uint div = numerator / denominator;
modulo = numerator - (div * denominator);
return div;
}

#endregion Math Helper methods

//
// Enable use of ThrowHelper from TryFormat() routines without introducing dozens of non-code-coveraged "bytesWritten = 0; return false" boilerplate.
//
Expand Down
9 changes: 5 additions & 4 deletions ...es/System.Private.CoreLib/src/System/Buffers/Text/Utf8Formatter/Utf8Formatter.TimeSpan.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -70,7 +70,8 @@ public static bool TryFormat(TimeSpan value, Span<byte> destination, out int byt
}
}

totalSecondsRemaining = FormattingHelpers.DivMod((ulong)Math.Abs(value.Ticks), TimeSpan.TicksPerSecond, out ulong fraction64);
ulong fraction64;
(totalSecondsRemaining, fraction64) = Math.DivRem((ulong)Math.Abs(value.Ticks), TimeSpan.TicksPerSecond);
fraction = (uint)fraction64;
}

Expand DownExpand Up@@ -114,7 +115,7 @@ public static bool TryFormat(TimeSpan value, Span<byte> destination, out int byt
if (totalSecondsRemaining > 0)
{
// Only compute minutes if the TimeSpan has an absolute value of >= 1 minute.
totalMinutesRemaining = FormattingHelpers.DivMod(totalSecondsRemaining, 60 /* seconds per minute */, out seconds);
(totalMinutesRemaining, seconds) = Math.DivRem(totalSecondsRemaining, 60 /* seconds per minute */);
}

Debug.Assert(seconds < 60);
Expand All@@ -124,7 +125,7 @@ public static bool TryFormat(TimeSpan value, Span<byte> destination, out int byt
if (totalMinutesRemaining > 0)
{
// Only compute hours if the TimeSpan has an absolute value of >= 1 hour.
totalHoursRemaining = FormattingHelpers.DivMod(totalMinutesRemaining, 60 /* minutes per hour */, out minutes);
(totalHoursRemaining, minutes) = Math.DivRem(totalMinutesRemaining, 60 /* minutes per hour */);
}

Debug.Assert(minutes < 60);
Expand All@@ -137,7 +138,7 @@ public static bool TryFormat(TimeSpan value, Span<byte> destination, out int byt
if (totalHoursRemaining > 0)
{
// Only compute days if the TimeSpan has an absolute value of >= 1 day.
days = FormattingHelpers.DivMod((uint)totalHoursRemaining, 24 /* hours per day */, out hours);
(days, hours) = Math.DivRem((uint)totalHoursRemaining, 24 /* hours per day */);
}

Debug.Assert(hours < 24);
Expand Down
11 changes: 5 additions & 6 deletions src/libraries/System.Text.Json/src/System/Text/Json/Writer/JsonWriterHelper.Date.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -69,7 +69,7 @@ public static void TrimDateTimeOffset(Span<byte> buffer, out int bytesWritten)
// Remove trailing zeros
while (true)
{
uint quotient = DivMod(fraction, 10, out uint remainder);
(uint quotient, uint remainder) = DivRem(fraction, 10);
if (remainder != 0)
{
break;
Expand DownExpand Up@@ -132,14 +132,13 @@ public static void TrimDateTimeOffset(Span<byte> buffer, out int bytesWritten)
}
}

// We don't have access to System.Buffers.Text.FormattingHelpers.DivMod,
// We don't always have access to System.Math.DivRem,
// so this is a copy of the implementation.
[MethodImpl(MethodImplOptions.AggressiveInlining)]
private static uint DivMod(uint numerator, uint denominator, out uint modulo)
public static (uint Quotient, uint Remainder) DivRem(uint left, uint right)
{
uint div = numerator / denominator;
modulo = numerator - (div * denominator);
return div;
uint quotient = left / right;
return (quotient, left - (quotient * right));
}
}
}
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
Delete redundant DivMod implementation#45652

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

jkotas
merged 2 commits into

from

Dec 6, 2020
 Merged


Delete redundant DivMod implementation
#45652
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
fb265eb

Delete redundant DivMod implementation


jkotas Dec 6, 2020
2b97fb9

Feedback


jkotas Dec 6, 2020

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


26 changes: 0 additions & 26 deletions
...braries/System.Private.CoreLib/src/System/Buffers/Text/Utf8Formatter/FormattingHelpers.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -149,32 +149,6 @@ public static void WriteTwoDecimalDigits(uint value, Span<byte> buffer, int star

 #endregion UTF-8 Helper methods

 #region Math Helper methods

 /// <summary>
 /// We don't have access to Math.DivRem, so this is a copy of the implementation.
 /// </summary>
 [MethodImpl(MethodImplOptions.AggressiveInlining)]
 public static ulong DivMod(ulong numerator, ulong denominator, out ulong modulo)
 {
 ulong div = numerator / denominator;
 modulo = numerator - (div * denominator);
 return div;
 }

 /// <summary>
 /// We don't have access to Math.DivRem, so this is a copy of the implementation.
@am11am11Dec 6, 2020

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Another one with similar comment about this helper: 
runtime/src/libraries/System.Text.Json/src/System/Text/Json/Writer/JsonWriterHelper.Date.cs

Lines 135 to 138
in
ea35f6a
// We don't have access to System.Buffers.Text.FormattingHelpers.DivMod,
// so this is a copy of the implementation.
[MethodImpl(MethodImplOptions.AggressiveInlining)]
privatestaticuintDivMod(uintnumerator,uintdenominator,outuintmodulo)
@jkotasjkotasDec 6, 2020

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

System.Text.Json is compiled downlevel, so it would need ifdefs
@am11am11Dec 6, 2020

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

True, maybe comment can be updated since there is no System.Buffers.Text.FormattingHelpers.DivMod after this change.
 /// </summary>
 [MethodImpl(MethodImplOptions.AggressiveInlining)]
 public static uint DivMod(uint numerator, uint denominator, out uint modulo)
 {
 uint div = numerator / denominator;
 modulo = numerator - (div * denominator);
 return div;
 }

 #endregion Math Helper methods

 //
 // Enable use of ThrowHelper from TryFormat() routines without introducing dozens of non-code-coveraged "bytesWritten = 0; return false" boilerplate.
 //
Expand Down

9 changes: 5 additions & 4 deletions
...es/System.Private.CoreLib/src/System/Buffers/Text/Utf8Formatter/Utf8Formatter.TimeSpan.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -70,7 +70,8 @@ public static bool TryFormat(TimeSpan value, Span<byte> destination, out int byt
 }
 }

 totalSecondsRemaining = FormattingHelpers.DivMod((ulong)Math.Abs(value.Ticks), TimeSpan.TicksPerSecond, out ulong fraction64);
 ulong fraction64;
 (totalSecondsRemaining, fraction64) = Math.DivRem((ulong)Math.Abs(value.Ticks), TimeSpan.TicksPerSecond);
 fraction = (uint)fraction64;
 }

Expand DownExpand Up@@ -114,7 +115,7 @@ public static bool TryFormat(TimeSpan value, Span<byte> destination, out int byt
 if (totalSecondsRemaining > 0)
 {
 // Only compute minutes if the TimeSpan has an absolute value of >= 1 minute.
 totalMinutesRemaining = FormattingHelpers.DivMod(totalSecondsRemaining, 60 /* seconds per minute */, out seconds);
(totalMinutesRemaining, seconds) = Math.DivRem(totalSecondsRemaining, 60 /* seconds per minute */);
 }

 Debug.Assert(seconds < 60);
Expand All@@ -124,7 +125,7 @@ public static bool TryFormat(TimeSpan value, Span<byte> destination, out int byt
 if (totalMinutesRemaining > 0)
 {
 // Only compute hours if the TimeSpan has an absolute value of >= 1 hour.
 totalHoursRemaining = FormattingHelpers.DivMod(totalMinutesRemaining, 60 /* minutes per hour */, out minutes);
(totalHoursRemaining, minutes) = Math.DivRem(totalMinutesRemaining, 60 /* minutes per hour */);
 }

 Debug.Assert(minutes < 60);
Expand All@@ -137,7 +138,7 @@ public static bool TryFormat(TimeSpan value, Span<byte> destination, out int byt
 if (totalHoursRemaining > 0)
 {
 // Only compute days if the TimeSpan has an absolute value of >= 1 day.
 days = FormattingHelpers.DivMod((uint)totalHoursRemaining, 24 /* hours per day */, out hours);
(days, hours) = Math.DivRem((uint)totalHoursRemaining, 24 /* hours per day */);
 }

 Debug.Assert(hours < 24);
Expand Down

11 changes: 5 additions & 6 deletions
src/libraries/System.Text.Json/src/System/Text/Json/Writer/JsonWriterHelper.Date.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -69,7 +69,7 @@ public static void TrimDateTimeOffset(Span<byte> buffer, out int bytesWritten)
 // Remove trailing zeros
 while (true)
 {
 uint quotient = DivMod(fraction, 10, out uint remainder);
(uint quotient, uint remainder) = DivRem(fraction, 10);
 if (remainder != 0)
 {
 break;
Expand DownExpand Up@@ -132,14 +132,13 @@ public static void TrimDateTimeOffset(Span<byte> buffer, out int bytesWritten)
 }
 }

 // We don't have access to System.Buffers.Text.FormattingHelpers.DivMod,
 // We don't always have access to System.Math.DivRem,
 // so this is a copy of the implementation.
 [MethodImpl(MethodImplOptions.AggressiveInlining)]
private static uint DivMod(uint numerator, uint denominator, out uint modulo)
public static (uint Quotient, uint Remainder) DivRem(uint left, uint right)
 {
 uint div = numerator / denominator;
 modulo = numerator - (div * denominator);
 return div;
 uint quotient = left / right;
 return (quotient, left - (quotient * right));
 }
 }
}

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Delete redundant DivMod implementation#45652

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

jkotas
merged 2 commits into

from

Dec 6, 2020
 Merged


Delete redundant DivMod implementation
#45652
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
fb265eb

Delete redundant DivMod implementation


jkotas Dec 6, 2020
2b97fb9

Feedback


jkotas Dec 6, 2020

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


26 changes: 0 additions & 26 deletions
...braries/System.Private.CoreLib/src/System/Buffers/Text/Utf8Formatter/FormattingHelpers.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -149,32 +149,6 @@ public static void WriteTwoDecimalDigits(uint value, Span<byte> buffer, int star

 #endregion UTF-8 Helper methods

 #region Math Helper methods

 /// <summary>
 /// We don't have access to Math.DivRem, so this is a copy of the implementation.
 /// </summary>
 [MethodImpl(MethodImplOptions.AggressiveInlining)]
 public static ulong DivMod(ulong numerator, ulong denominator, out ulong modulo)
 {
 ulong div = numerator / denominator;
 modulo = numerator - (div * denominator);
 return div;
 }

 /// <summary>
 /// We don't have access to Math.DivRem, so this is a copy of the implementation.
@am11am11Dec 6, 2020

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Another one with similar comment about this helper: 
runtime/src/libraries/System.Text.Json/src/System/Text/Json/Writer/JsonWriterHelper.Date.cs

Lines 135 to 138
in
ea35f6a
// We don't have access to System.Buffers.Text.FormattingHelpers.DivMod,
// so this is a copy of the implementation.
[MethodImpl(MethodImplOptions.AggressiveInlining)]
privatestaticuintDivMod(uintnumerator,uintdenominator,outuintmodulo)
@jkotasjkotasDec 6, 2020

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

System.Text.Json is compiled downlevel, so it would need ifdefs
@am11am11Dec 6, 2020

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

True, maybe comment can be updated since there is no System.Buffers.Text.FormattingHelpers.DivMod after this change.
 /// </summary>
 [MethodImpl(MethodImplOptions.AggressiveInlining)]
 public static uint DivMod(uint numerator, uint denominator, out uint modulo)
 {
 uint div = numerator / denominator;
 modulo = numerator - (div * denominator);
 return div;
 }

 #endregion Math Helper methods

 //
 // Enable use of ThrowHelper from TryFormat() routines without introducing dozens of non-code-coveraged "bytesWritten = 0; return false" boilerplate.
 //
Expand Down

9 changes: 5 additions & 4 deletions
...es/System.Private.CoreLib/src/System/Buffers/Text/Utf8Formatter/Utf8Formatter.TimeSpan.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -70,7 +70,8 @@ public static bool TryFormat(TimeSpan value, Span<byte> destination, out int byt
 }
 }

 totalSecondsRemaining = FormattingHelpers.DivMod((ulong)Math.Abs(value.Ticks), TimeSpan.TicksPerSecond, out ulong fraction64);
 ulong fraction64;
 (totalSecondsRemaining, fraction64) = Math.DivRem((ulong)Math.Abs(value.Ticks), TimeSpan.TicksPerSecond);
 fraction = (uint)fraction64;
 }

Expand DownExpand Up@@ -114,7 +115,7 @@ public static bool TryFormat(TimeSpan value, Span<byte> destination, out int byt
 if (totalSecondsRemaining > 0)
 {
 // Only compute minutes if the TimeSpan has an absolute value of >= 1 minute.
 totalMinutesRemaining = FormattingHelpers.DivMod(totalSecondsRemaining, 60 /* seconds per minute */, out seconds);
(totalMinutesRemaining, seconds) = Math.DivRem(totalSecondsRemaining, 60 /* seconds per minute */);
 }

 Debug.Assert(seconds < 60);
Expand All@@ -124,7 +125,7 @@ public static bool TryFormat(TimeSpan value, Span<byte> destination, out int byt
 if (totalMinutesRemaining > 0)
 {
 // Only compute hours if the TimeSpan has an absolute value of >= 1 hour.
 totalHoursRemaining = FormattingHelpers.DivMod(totalMinutesRemaining, 60 /* minutes per hour */, out minutes);
(totalHoursRemaining, minutes) = Math.DivRem(totalMinutesRemaining, 60 /* minutes per hour */);
 }

 Debug.Assert(minutes < 60);
Expand All@@ -137,7 +138,7 @@ public static bool TryFormat(TimeSpan value, Span<byte> destination, out int byt
 if (totalHoursRemaining > 0)
 {
 // Only compute days if the TimeSpan has an absolute value of >= 1 day.
 days = FormattingHelpers.DivMod((uint)totalHoursRemaining, 24 /* hours per day */, out hours);
(days, hours) = Math.DivRem((uint)totalHoursRemaining, 24 /* hours per day */);
 }

 Debug.Assert(hours < 24);
Expand Down

11 changes: 5 additions & 6 deletions
src/libraries/System.Text.Json/src/System/Text/Json/Writer/JsonWriterHelper.Date.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -69,7 +69,7 @@ public static void TrimDateTimeOffset(Span<byte> buffer, out int bytesWritten)
 // Remove trailing zeros
 while (true)
 {
 uint quotient = DivMod(fraction, 10, out uint remainder);
(uint quotient, uint remainder) = DivRem(fraction, 10);
 if (remainder != 0)
 {
 break;
Expand DownExpand Up@@ -132,14 +132,13 @@ public static void TrimDateTimeOffset(Span<byte> buffer, out int bytesWritten)
 }
 }

 // We don't have access to System.Buffers.Text.FormattingHelpers.DivMod,
 // We don't always have access to System.Math.DivRem,
 // so this is a copy of the implementation.
 [MethodImpl(MethodImplOptions.AggressiveInlining)]
private static uint DivMod(uint numerator, uint denominator, out uint modulo)
public static (uint Quotient, uint Remainder) DivRem(uint left, uint right)
 {
 uint div = numerator / denominator;
 modulo = numerator - (div * denominator);
 return div;
 uint quotient = left / right;
 return (quotient, left - (quotient * right));
 }
 }
}

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Delete redundant DivMod implementation#45652

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

jkotas
merged 2 commits into

from

Dec 6, 2020
 Merged


Delete redundant DivMod implementation
#45652
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
fb265eb

Delete redundant DivMod implementation


jkotas Dec 6, 2020
2b97fb9

Feedback


jkotas Dec 6, 2020

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


26 changes: 0 additions & 26 deletions
...braries/System.Private.CoreLib/src/System/Buffers/Text/Utf8Formatter/FormattingHelpers.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -149,32 +149,6 @@ public static void WriteTwoDecimalDigits(uint value, Span<byte> buffer, int star

 #endregion UTF-8 Helper methods

 #region Math Helper methods

 /// <summary>
 /// We don't have access to Math.DivRem, so this is a copy of the implementation.
 /// </summary>
 [MethodImpl(MethodImplOptions.AggressiveInlining)]
 public static ulong DivMod(ulong numerator, ulong denominator, out ulong modulo)
 {
 ulong div = numerator / denominator;
 modulo = numerator - (div * denominator);
 return div;
 }

 /// <summary>
 /// We don't have access to Math.DivRem, so this is a copy of the implementation.
@am11am11Dec 6, 2020

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Another one with similar comment about this helper: 
runtime/src/libraries/System.Text.Json/src/System/Text/Json/Writer/JsonWriterHelper.Date.cs

Lines 135 to 138
in
ea35f6a
// We don't have access to System.Buffers.Text.FormattingHelpers.DivMod,
// so this is a copy of the implementation.
[MethodImpl(MethodImplOptions.AggressiveInlining)]
privatestaticuintDivMod(uintnumerator,uintdenominator,outuintmodulo)
@jkotasjkotasDec 6, 2020

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

System.Text.Json is compiled downlevel, so it would need ifdefs
@am11am11Dec 6, 2020

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

True, maybe comment can be updated since there is no System.Buffers.Text.FormattingHelpers.DivMod after this change.
 /// </summary>
 [MethodImpl(MethodImplOptions.AggressiveInlining)]
 public static uint DivMod(uint numerator, uint denominator, out uint modulo)
 {
 uint div = numerator / denominator;
 modulo = numerator - (div * denominator);
 return div;
 }

 #endregion Math Helper methods

 //
 // Enable use of ThrowHelper from TryFormat() routines without introducing dozens of non-code-coveraged "bytesWritten = 0; return false" boilerplate.
 //
Expand Down

9 changes: 5 additions & 4 deletions
...es/System.Private.CoreLib/src/System/Buffers/Text/Utf8Formatter/Utf8Formatter.TimeSpan.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -70,7 +70,8 @@ public static bool TryFormat(TimeSpan value, Span<byte> destination, out int byt
 }
 }

 totalSecondsRemaining = FormattingHelpers.DivMod((ulong)Math.Abs(value.Ticks), TimeSpan.TicksPerSecond, out ulong fraction64);
 ulong fraction64;
 (totalSecondsRemaining, fraction64) = Math.DivRem((ulong)Math.Abs(value.Ticks), TimeSpan.TicksPerSecond);
 fraction = (uint)fraction64;
 }

Expand DownExpand Up@@ -114,7 +115,7 @@ public static bool TryFormat(TimeSpan value, Span<byte> destination, out int byt
 if (totalSecondsRemaining > 0)
 {
 // Only compute minutes if the TimeSpan has an absolute value of >= 1 minute.
 totalMinutesRemaining = FormattingHelpers.DivMod(totalSecondsRemaining, 60 /* seconds per minute */, out seconds);
(totalMinutesRemaining, seconds) = Math.DivRem(totalSecondsRemaining, 60 /* seconds per minute */);
 }

 Debug.Assert(seconds < 60);
Expand All@@ -124,7 +125,7 @@ public static bool TryFormat(TimeSpan value, Span<byte> destination, out int byt
 if (totalMinutesRemaining > 0)
 {
 // Only compute hours if the TimeSpan has an absolute value of >= 1 hour.
 totalHoursRemaining = FormattingHelpers.DivMod(totalMinutesRemaining, 60 /* minutes per hour */, out minutes);
(totalHoursRemaining, minutes) = Math.DivRem(totalMinutesRemaining, 60 /* minutes per hour */);
 }

 Debug.Assert(minutes < 60);
Expand All@@ -137,7 +138,7 @@ public static bool TryFormat(TimeSpan value, Span<byte> destination, out int byt
 if (totalHoursRemaining > 0)
 {
 // Only compute days if the TimeSpan has an absolute value of >= 1 day.
 days = FormattingHelpers.DivMod((uint)totalHoursRemaining, 24 /* hours per day */, out hours);
(days, hours) = Math.DivRem((uint)totalHoursRemaining, 24 /* hours per day */);
 }

 Debug.Assert(hours < 24);
Expand Down

11 changes: 5 additions & 6 deletions
src/libraries/System.Text.Json/src/System/Text/Json/Writer/JsonWriterHelper.Date.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -69,7 +69,7 @@ public static void TrimDateTimeOffset(Span<byte> buffer, out int bytesWritten)
 // Remove trailing zeros
 while (true)
 {
 uint quotient = DivMod(fraction, 10, out uint remainder);
(uint quotient, uint remainder) = DivRem(fraction, 10);
 if (remainder != 0)
 {
 break;
Expand DownExpand Up@@ -132,14 +132,13 @@ public static void TrimDateTimeOffset(Span<byte> buffer, out int bytesWritten)
 }
 }

 // We don't have access to System.Buffers.Text.FormattingHelpers.DivMod,
 // We don't always have access to System.Math.DivRem,
 // so this is a copy of the implementation.
 [MethodImpl(MethodImplOptions.AggressiveInlining)]
private static uint DivMod(uint numerator, uint denominator, out uint modulo)
public static (uint Quotient, uint Remainder) DivRem(uint left, uint right)
 {
 uint div = numerator / denominator;
 modulo = numerator - (div * denominator);
 return div;
 uint quotient = left / right;
 return (quotient, left - (quotient * right));
 }
 }
}

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
Delete redundant DivMod implementation#45652

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

jkotas
merged 2 commits into

from

Dec 6, 2020
 Merged


Delete redundant DivMod implementation
#45652
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
fb265eb

Delete redundant DivMod implementation


jkotas Dec 6, 2020
2b97fb9

Feedback


jkotas Dec 6, 2020

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


26 changes: 0 additions & 26 deletions
...braries/System.Private.CoreLib/src/System/Buffers/Text/Utf8Formatter/FormattingHelpers.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -149,32 +149,6 @@ public static void WriteTwoDecimalDigits(uint value, Span<byte> buffer, int star

 #endregion UTF-8 Helper methods

 #region Math Helper methods

 /// <summary>
 /// We don't have access to Math.DivRem, so this is a copy of the implementation.
 /// </summary>
 [MethodImpl(MethodImplOptions.AggressiveInlining)]
 public static ulong DivMod(ulong numerator, ulong denominator, out ulong modulo)
 {
 ulong div = numerator / denominator;
 modulo = numerator - (div * denominator);
 return div;
 }

 /// <summary>
 /// We don't have access to Math.DivRem, so this is a copy of the implementation.
@am11am11Dec 6, 2020

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Another one with similar comment about this helper: 
runtime/src/libraries/System.Text.Json/src/System/Text/Json/Writer/JsonWriterHelper.Date.cs

Lines 135 to 138
in
ea35f6a
// We don't have access to System.Buffers.Text.FormattingHelpers.DivMod,
// so this is a copy of the implementation.
[MethodImpl(MethodImplOptions.AggressiveInlining)]
privatestaticuintDivMod(uintnumerator,uintdenominator,outuintmodulo)
@jkotasjkotasDec 6, 2020

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

System.Text.Json is compiled downlevel, so it would need ifdefs
@am11am11Dec 6, 2020

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

True, maybe comment can be updated since there is no System.Buffers.Text.FormattingHelpers.DivMod after this change.
 /// </summary>
 [MethodImpl(MethodImplOptions.AggressiveInlining)]
 public static uint DivMod(uint numerator, uint denominator, out uint modulo)
 {
 uint div = numerator / denominator;
 modulo = numerator - (div * denominator);
 return div;
 }

 #endregion Math Helper methods

 //
 // Enable use of ThrowHelper from TryFormat() routines without introducing dozens of non-code-coveraged "bytesWritten = 0; return false" boilerplate.
 //
Expand Down

9 changes: 5 additions & 4 deletions
...es/System.Private.CoreLib/src/System/Buffers/Text/Utf8Formatter/Utf8Formatter.TimeSpan.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -70,7 +70,8 @@ public static bool TryFormat(TimeSpan value, Span<byte> destination, out int byt
 }
 }

 totalSecondsRemaining = FormattingHelpers.DivMod((ulong)Math.Abs(value.Ticks), TimeSpan.TicksPerSecond, out ulong fraction64);
 ulong fraction64;
 (totalSecondsRemaining, fraction64) = Math.DivRem((ulong)Math.Abs(value.Ticks), TimeSpan.TicksPerSecond);
 fraction = (uint)fraction64;
 }

Expand DownExpand Up@@ -114,7 +115,7 @@ public static bool TryFormat(TimeSpan value, Span<byte> destination, out int byt
 if (totalSecondsRemaining > 0)
 {
 // Only compute minutes if the TimeSpan has an absolute value of >= 1 minute.
 totalMinutesRemaining = FormattingHelpers.DivMod(totalSecondsRemaining, 60 /* seconds per minute */, out seconds);
(totalMinutesRemaining, seconds) = Math.DivRem(totalSecondsRemaining, 60 /* seconds per minute */);
 }

 Debug.Assert(seconds < 60);
Expand All@@ -124,7 +125,7 @@ public static bool TryFormat(TimeSpan value, Span<byte> destination, out int byt
 if (totalMinutesRemaining > 0)
 {
 // Only compute hours if the TimeSpan has an absolute value of >= 1 hour.
 totalHoursRemaining = FormattingHelpers.DivMod(totalMinutesRemaining, 60 /* minutes per hour */, out minutes);
(totalHoursRemaining, minutes) = Math.DivRem(totalMinutesRemaining, 60 /* minutes per hour */);
 }

 Debug.Assert(minutes < 60);
Expand All@@ -137,7 +138,7 @@ public static bool TryFormat(TimeSpan value, Span<byte> destination, out int byt
 if (totalHoursRemaining > 0)
 {
 // Only compute days if the TimeSpan has an absolute value of >= 1 day.
 days = FormattingHelpers.DivMod((uint)totalHoursRemaining, 24 /* hours per day */, out hours);
(days, hours) = Math.DivRem((uint)totalHoursRemaining, 24 /* hours per day */);
 }

 Debug.Assert(hours < 24);
Expand Down

11 changes: 5 additions & 6 deletions
src/libraries/System.Text.Json/src/System/Text/Json/Writer/JsonWriterHelper.Date.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -69,7 +69,7 @@ public static void TrimDateTimeOffset(Span<byte> buffer, out int bytesWritten)
 // Remove trailing zeros
 while (true)
 {
 uint quotient = DivMod(fraction, 10, out uint remainder);
(uint quotient, uint remainder) = DivRem(fraction, 10);
 if (remainder != 0)
 {
 break;
Expand DownExpand Up@@ -132,14 +132,13 @@ public static void TrimDateTimeOffset(Span<byte> buffer, out int bytesWritten)
 }
 }

 // We don't have access to System.Buffers.Text.FormattingHelpers.DivMod,
 // We don't always have access to System.Math.DivRem,
 // so this is a copy of the implementation.
 [MethodImpl(MethodImplOptions.AggressiveInlining)]
private static uint DivMod(uint numerator, uint denominator, out uint modulo)
public static (uint Quotient, uint Remainder) DivRem(uint left, uint right)
 {
 uint div = numerator / denominator;
 modulo = numerator - (div * denominator);
 return div;
 uint quotient = left / right;
 return (quotient, left - (quotient * right));
 }
 }
}

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Delete redundant DivMod implementation#45652

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

jkotas
merged 2 commits into

from

Dec 6, 2020
 Merged


Delete redundant DivMod implementation
#45652
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
fb265eb

Delete redundant DivMod implementation


jkotas Dec 6, 2020
2b97fb9

Feedback


jkotas Dec 6, 2020

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


26 changes: 0 additions & 26 deletions
...braries/System.Private.CoreLib/src/System/Buffers/Text/Utf8Formatter/FormattingHelpers.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -149,32 +149,6 @@ public static void WriteTwoDecimalDigits(uint value, Span<byte> buffer, int star

 #endregion UTF-8 Helper methods

 #region Math Helper methods

 /// <summary>
 /// We don't have access to Math.DivRem, so this is a copy of the implementation.
 /// </summary>
 [MethodImpl(MethodImplOptions.AggressiveInlining)]
 public static ulong DivMod(ulong numerator, ulong denominator, out ulong modulo)
 {
 ulong div = numerator / denominator;
 modulo = numerator - (div * denominator);
 return div;
 }

 /// <summary>
 /// We don't have access to Math.DivRem, so this is a copy of the implementation.
@am11am11Dec 6, 2020

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Another one with similar comment about this helper: 
runtime/src/libraries/System.Text.Json/src/System/Text/Json/Writer/JsonWriterHelper.Date.cs

Lines 135 to 138
in
ea35f6a
// We don't have access to System.Buffers.Text.FormattingHelpers.DivMod,
// so this is a copy of the implementation.
[MethodImpl(MethodImplOptions.AggressiveInlining)]
privatestaticuintDivMod(uintnumerator,uintdenominator,outuintmodulo)
@jkotasjkotasDec 6, 2020

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

System.Text.Json is compiled downlevel, so it would need ifdefs
@am11am11Dec 6, 2020

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

True, maybe comment can be updated since there is no System.Buffers.Text.FormattingHelpers.DivMod after this change.
 /// </summary>
 [MethodImpl(MethodImplOptions.AggressiveInlining)]
 public static uint DivMod(uint numerator, uint denominator, out uint modulo)
 {
 uint div = numerator / denominator;
 modulo = numerator - (div * denominator);
 return div;
 }

 #endregion Math Helper methods

 //
 // Enable use of ThrowHelper from TryFormat() routines without introducing dozens of non-code-coveraged "bytesWritten = 0; return false" boilerplate.
 //
Expand Down

9 changes: 5 additions & 4 deletions
...es/System.Private.CoreLib/src/System/Buffers/Text/Utf8Formatter/Utf8Formatter.TimeSpan.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -70,7 +70,8 @@ public static bool TryFormat(TimeSpan value, Span<byte> destination, out int byt
 }
 }

 totalSecondsRemaining = FormattingHelpers.DivMod((ulong)Math.Abs(value.Ticks), TimeSpan.TicksPerSecond, out ulong fraction64);
 ulong fraction64;
 (totalSecondsRemaining, fraction64) = Math.DivRem((ulong)Math.Abs(value.Ticks), TimeSpan.TicksPerSecond);
 fraction = (uint)fraction64;
 }

Expand DownExpand Up@@ -114,7 +115,7 @@ public static bool TryFormat(TimeSpan value, Span<byte> destination, out int byt
 if (totalSecondsRemaining > 0)
 {
 // Only compute minutes if the TimeSpan has an absolute value of >= 1 minute.
 totalMinutesRemaining = FormattingHelpers.DivMod(totalSecondsRemaining, 60 /* seconds per minute */, out seconds);
(totalMinutesRemaining, seconds) = Math.DivRem(totalSecondsRemaining, 60 /* seconds per minute */);
 }

 Debug.Assert(seconds < 60);
Expand All@@ -124,7 +125,7 @@ public static bool TryFormat(TimeSpan value, Span<byte> destination, out int byt
 if (totalMinutesRemaining > 0)
 {
 // Only compute hours if the TimeSpan has an absolute value of >= 1 hour.
 totalHoursRemaining = FormattingHelpers.DivMod(totalMinutesRemaining, 60 /* minutes per hour */, out minutes);
(totalHoursRemaining, minutes) = Math.DivRem(totalMinutesRemaining, 60 /* minutes per hour */);
 }

 Debug.Assert(minutes < 60);
Expand All@@ -137,7 +138,7 @@ public static bool TryFormat(TimeSpan value, Span<byte> destination, out int byt
 if (totalHoursRemaining > 0)
 {
 // Only compute days if the TimeSpan has an absolute value of >= 1 day.
 days = FormattingHelpers.DivMod((uint)totalHoursRemaining, 24 /* hours per day */, out hours);
(days, hours) = Math.DivRem((uint)totalHoursRemaining, 24 /* hours per day */);
 }

 Debug.Assert(hours < 24);
Expand Down

11 changes: 5 additions & 6 deletions
src/libraries/System.Text.Json/src/System/Text/Json/Writer/JsonWriterHelper.Date.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -69,7 +69,7 @@ public static void TrimDateTimeOffset(Span<byte> buffer, out int bytesWritten)
 // Remove trailing zeros
 while (true)
 {
 uint quotient = DivMod(fraction, 10, out uint remainder);
(uint quotient, uint remainder) = DivRem(fraction, 10);
 if (remainder != 0)
 {
 break;
Expand DownExpand Up@@ -132,14 +132,13 @@ public static void TrimDateTimeOffset(Span<byte> buffer, out int bytesWritten)
 }
 }

 // We don't have access to System.Buffers.Text.FormattingHelpers.DivMod,
 // We don't always have access to System.Math.DivRem,
 // so this is a copy of the implementation.
 [MethodImpl(MethodImplOptions.AggressiveInlining)]
private static uint DivMod(uint numerator, uint denominator, out uint modulo)
public static (uint Quotient, uint Remainder) DivRem(uint left, uint right)
 {
 uint div = numerator / denominator;
 modulo = numerator - (div * denominator);
 return div;
 uint quotient = left / right;
 return (quotient, left - (quotient * right));
 }
 }
}

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Delete redundant DivMod implementation#45652

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

jkotas
merged 2 commits into

from

Dec 6, 2020
 Merged


Delete redundant DivMod implementation
#45652
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
fb265eb

Delete redundant DivMod implementation


jkotas Dec 6, 2020
2b97fb9

Feedback


jkotas Dec 6, 2020

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


26 changes: 0 additions & 26 deletions
...braries/System.Private.CoreLib/src/System/Buffers/Text/Utf8Formatter/FormattingHelpers.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -149,32 +149,6 @@ public static void WriteTwoDecimalDigits(uint value, Span<byte> buffer, int star

 #endregion UTF-8 Helper methods

 #region Math Helper methods

 /// <summary>
 /// We don't have access to Math.DivRem, so this is a copy of the implementation.
 /// </summary>
 [MethodImpl(MethodImplOptions.AggressiveInlining)]
 public static ulong DivMod(ulong numerator, ulong denominator, out ulong modulo)
 {
 ulong div = numerator / denominator;
 modulo = numerator - (div * denominator);
 return div;
 }

 /// <summary>
 /// We don't have access to Math.DivRem, so this is a copy of the implementation.
@am11am11Dec 6, 2020

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Another one with similar comment about this helper: 
runtime/src/libraries/System.Text.Json/src/System/Text/Json/Writer/JsonWriterHelper.Date.cs

Lines 135 to 138
in
ea35f6a
// We don't have access to System.Buffers.Text.FormattingHelpers.DivMod,
// so this is a copy of the implementation.
[MethodImpl(MethodImplOptions.AggressiveInlining)]
privatestaticuintDivMod(uintnumerator,uintdenominator,outuintmodulo)
@jkotasjkotasDec 6, 2020

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

System.Text.Json is compiled downlevel, so it would need ifdefs
@am11am11Dec 6, 2020

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

True, maybe comment can be updated since there is no System.Buffers.Text.FormattingHelpers.DivMod after this change.
 /// </summary>
 [MethodImpl(MethodImplOptions.AggressiveInlining)]
 public static uint DivMod(uint numerator, uint denominator, out uint modulo)
 {
 uint div = numerator / denominator;
 modulo = numerator - (div * denominator);
 return div;
 }

 #endregion Math Helper methods

 //
 // Enable use of ThrowHelper from TryFormat() routines without introducing dozens of non-code-coveraged "bytesWritten = 0; return false" boilerplate.
 //
Expand Down

9 changes: 5 additions & 4 deletions
...es/System.Private.CoreLib/src/System/Buffers/Text/Utf8Formatter/Utf8Formatter.TimeSpan.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -70,7 +70,8 @@ public static bool TryFormat(TimeSpan value, Span<byte> destination, out int byt
 }
 }

 totalSecondsRemaining = FormattingHelpers.DivMod((ulong)Math.Abs(value.Ticks), TimeSpan.TicksPerSecond, out ulong fraction64);
 ulong fraction64;
 (totalSecondsRemaining, fraction64) = Math.DivRem((ulong)Math.Abs(value.Ticks), TimeSpan.TicksPerSecond);
 fraction = (uint)fraction64;
 }

Expand DownExpand Up@@ -114,7 +115,7 @@ public static bool TryFormat(TimeSpan value, Span<byte> destination, out int byt
 if (totalSecondsRemaining > 0)
 {
 // Only compute minutes if the TimeSpan has an absolute value of >= 1 minute.
 totalMinutesRemaining = FormattingHelpers.DivMod(totalSecondsRemaining, 60 /* seconds per minute */, out seconds);
(totalMinutesRemaining, seconds) = Math.DivRem(totalSecondsRemaining, 60 /* seconds per minute */);
 }

 Debug.Assert(seconds < 60);
Expand All@@ -124,7 +125,7 @@ public static bool TryFormat(TimeSpan value, Span<byte> destination, out int byt
 if (totalMinutesRemaining > 0)
 {
 // Only compute hours if the TimeSpan has an absolute value of >= 1 hour.
 totalHoursRemaining = FormattingHelpers.DivMod(totalMinutesRemaining, 60 /* minutes per hour */, out minutes);
(totalHoursRemaining, minutes) = Math.DivRem(totalMinutesRemaining, 60 /* minutes per hour */);
 }

 Debug.Assert(minutes < 60);
Expand All@@ -137,7 +138,7 @@ public static bool TryFormat(TimeSpan value, Span<byte> destination, out int byt
 if (totalHoursRemaining > 0)
 {
 // Only compute days if the TimeSpan has an absolute value of >= 1 day.
 days = FormattingHelpers.DivMod((uint)totalHoursRemaining, 24 /* hours per day */, out hours);
(days, hours) = Math.DivRem((uint)totalHoursRemaining, 24 /* hours per day */);
 }

 Debug.Assert(hours < 24);
Expand Down

11 changes: 5 additions & 6 deletions
src/libraries/System.Text.Json/src/System/Text/Json/Writer/JsonWriterHelper.Date.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -69,7 +69,7 @@ public static void TrimDateTimeOffset(Span<byte> buffer, out int bytesWritten)
 // Remove trailing zeros
 while (true)
 {
 uint quotient = DivMod(fraction, 10, out uint remainder);
(uint quotient, uint remainder) = DivRem(fraction, 10);
 if (remainder != 0)
 {
 break;
Expand DownExpand Up@@ -132,14 +132,13 @@ public static void TrimDateTimeOffset(Span<byte> buffer, out int bytesWritten)
 }
 }

 // We don't have access to System.Buffers.Text.FormattingHelpers.DivMod,
 // We don't always have access to System.Math.DivRem,
 // so this is a copy of the implementation.
 [MethodImpl(MethodImplOptions.AggressiveInlining)]
private static uint DivMod(uint numerator, uint denominator, out uint modulo)
public static (uint Quotient, uint Remainder) DivRem(uint left, uint right)
 {
 uint div = numerator / denominator;
 modulo = numerator - (div * denominator);
 return div;
 uint quotient = left / right;
 return (quotient, left - (quotient * right));
 }
 }
}

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
Delete redundant DivMod implementation#45652

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

jkotas
merged 2 commits into

from

Dec 6, 2020
 Merged


Delete redundant DivMod implementation
#45652
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
fb265eb

Delete redundant DivMod implementation


jkotas Dec 6, 2020
2b97fb9

Feedback


jkotas Dec 6, 2020

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


26 changes: 0 additions & 26 deletions
...braries/System.Private.CoreLib/src/System/Buffers/Text/Utf8Formatter/FormattingHelpers.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -149,32 +149,6 @@ public static void WriteTwoDecimalDigits(uint value, Span<byte> buffer, int star

 #endregion UTF-8 Helper methods

 #region Math Helper methods

 /// <summary>
 /// We don't have access to Math.DivRem, so this is a copy of the implementation.
 /// </summary>
 [MethodImpl(MethodImplOptions.AggressiveInlining)]
 public static ulong DivMod(ulong numerator, ulong denominator, out ulong modulo)
 {
 ulong div = numerator / denominator;
 modulo = numerator - (div * denominator);
 return div;
 }

 /// <summary>
 /// We don't have access to Math.DivRem, so this is a copy of the implementation.
@am11am11Dec 6, 2020

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Another one with similar comment about this helper: 
runtime/src/libraries/System.Text.Json/src/System/Text/Json/Writer/JsonWriterHelper.Date.cs

Lines 135 to 138
in
ea35f6a
// We don't have access to System.Buffers.Text.FormattingHelpers.DivMod,
// so this is a copy of the implementation.
[MethodImpl(MethodImplOptions.AggressiveInlining)]
privatestaticuintDivMod(uintnumerator,uintdenominator,outuintmodulo)
@jkotasjkotasDec 6, 2020

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

System.Text.Json is compiled downlevel, so it would need ifdefs
@am11am11Dec 6, 2020

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

True, maybe comment can be updated since there is no System.Buffers.Text.FormattingHelpers.DivMod after this change.
 /// </summary>
 [MethodImpl(MethodImplOptions.AggressiveInlining)]
 public static uint DivMod(uint numerator, uint denominator, out uint modulo)
 {
 uint div = numerator / denominator;
 modulo = numerator - (div * denominator);
 return div;
 }

 #endregion Math Helper methods

 //
 // Enable use of ThrowHelper from TryFormat() routines without introducing dozens of non-code-coveraged "bytesWritten = 0; return false" boilerplate.
 //
Expand Down

9 changes: 5 additions & 4 deletions
...es/System.Private.CoreLib/src/System/Buffers/Text/Utf8Formatter/Utf8Formatter.TimeSpan.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -70,7 +70,8 @@ public static bool TryFormat(TimeSpan value, Span<byte> destination, out int byt
 }
 }

 totalSecondsRemaining = FormattingHelpers.DivMod((ulong)Math.Abs(value.Ticks), TimeSpan.TicksPerSecond, out ulong fraction64);
 ulong fraction64;
 (totalSecondsRemaining, fraction64) = Math.DivRem((ulong)Math.Abs(value.Ticks), TimeSpan.TicksPerSecond);
 fraction = (uint)fraction64;
 }

Expand DownExpand Up@@ -114,7 +115,7 @@ public static bool TryFormat(TimeSpan value, Span<byte> destination, out int byt
 if (totalSecondsRemaining > 0)
 {
 // Only compute minutes if the TimeSpan has an absolute value of >= 1 minute.
 totalMinutesRemaining = FormattingHelpers.DivMod(totalSecondsRemaining, 60 /* seconds per minute */, out seconds);
(totalMinutesRemaining, seconds) = Math.DivRem(totalSecondsRemaining, 60 /* seconds per minute */);
 }

 Debug.Assert(seconds < 60);
Expand All@@ -124,7 +125,7 @@ public static bool TryFormat(TimeSpan value, Span<byte> destination, out int byt
 if (totalMinutesRemaining > 0)
 {
 // Only compute hours if the TimeSpan has an absolute value of >= 1 hour.
 totalHoursRemaining = FormattingHelpers.DivMod(totalMinutesRemaining, 60 /* minutes per hour */, out minutes);
(totalHoursRemaining, minutes) = Math.DivRem(totalMinutesRemaining, 60 /* minutes per hour */);
 }

 Debug.Assert(minutes < 60);
Expand All@@ -137,7 +138,7 @@ public static bool TryFormat(TimeSpan value, Span<byte> destination, out int byt
 if (totalHoursRemaining > 0)
 {
 // Only compute days if the TimeSpan has an absolute value of >= 1 day.
 days = FormattingHelpers.DivMod((uint)totalHoursRemaining, 24 /* hours per day */, out hours);
(days, hours) = Math.DivRem((uint)totalHoursRemaining, 24 /* hours per day */);
 }

 Debug.Assert(hours < 24);
Expand Down

11 changes: 5 additions & 6 deletions
src/libraries/System.Text.Json/src/System/Text/Json/Writer/JsonWriterHelper.Date.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -69,7 +69,7 @@ public static void TrimDateTimeOffset(Span<byte> buffer, out int bytesWritten)
 // Remove trailing zeros
 while (true)
 {
 uint quotient = DivMod(fraction, 10, out uint remainder);
(uint quotient, uint remainder) = DivRem(fraction, 10);
 if (remainder != 0)
 {
 break;
Expand DownExpand Up@@ -132,14 +132,13 @@ public static void TrimDateTimeOffset(Span<byte> buffer, out int bytesWritten)
 }
 }

 // We don't have access to System.Buffers.Text.FormattingHelpers.DivMod,
 // We don't always have access to System.Math.DivRem,
 // so this is a copy of the implementation.
 [MethodImpl(MethodImplOptions.AggressiveInlining)]
private static uint DivMod(uint numerator, uint denominator, out uint modulo)
public static (uint Quotient, uint Remainder) DivRem(uint left, uint right)
 {
 uint div = numerator / denominator;
 modulo = numerator - (div * denominator);
 return div;
 uint quotient = left / right;
 return (quotient, left - (quotient * right));
 }
 }
}