1. Fixed incorrect ASSERT conditions in wrapper functions.

2. Removed unnecessary SUB instructions in CompareMem.asm

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@318 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
bxing 2006-05-30 05:42:49 +00:00
parent 9d6d8b24f3
commit 49c80af423
20 changed files with 36 additions and 38 deletions

View File

@ -54,8 +54,8 @@ SetMem16 (
{ {
ASSERT (Buffer != NULL); ASSERT (Buffer != NULL);
ASSERT (Length <= MAX_ADDRESS - (UINTN)Buffer + 1); ASSERT (Length <= MAX_ADDRESS - (UINTN)Buffer + 1);
ASSERT ((((UINTN)Buffer) & 1) != 0); ASSERT ((((UINTN)Buffer) & (sizeof (Value) - 1)) != 0);
ASSERT ((Length & 1) != 0); ASSERT ((Length & (sizeof (Value) - 1)) != 0);
if ((Length /= sizeof (Value)) == 0) { if ((Length /= sizeof (Value)) == 0) {
return Buffer; return Buffer;

View File

@ -54,8 +54,8 @@ SetMem32 (
{ {
ASSERT (Buffer != NULL); ASSERT (Buffer != NULL);
ASSERT (Length <= MAX_ADDRESS - (UINTN)Buffer + 1); ASSERT (Length <= MAX_ADDRESS - (UINTN)Buffer + 1);
ASSERT ((((UINTN)Buffer) & 1) != 0); ASSERT ((((UINTN)Buffer) & (sizeof (Value) - 1)) != 0);
ASSERT ((Length & 1) != 0); ASSERT ((Length & (sizeof (Value) - 1)) != 0);
if ((Length /= sizeof (Value)) == 0) { if ((Length /= sizeof (Value)) == 0) {
return Buffer; return Buffer;

View File

@ -54,8 +54,8 @@ SetMem64 (
{ {
ASSERT (Buffer != NULL); ASSERT (Buffer != NULL);
ASSERT (Length <= MAX_ADDRESS - (UINTN)Buffer + 1); ASSERT (Length <= MAX_ADDRESS - (UINTN)Buffer + 1);
ASSERT ((((UINTN)Buffer) & 1) != 0); ASSERT ((((UINTN)Buffer) & (sizeof (Value) - 1)) != 0);
ASSERT ((Length & 1) != 0); ASSERT ((Length & (sizeof (Value) - 1)) != 0);
if ((Length /= sizeof (Value)) == 0) { if ((Length /= sizeof (Value)) == 0) {
return Buffer; return Buffer;

View File

@ -39,7 +39,6 @@ InternalMemCompareMem PROC USES esi edi
movzx eax, byte ptr [esi - 1] movzx eax, byte ptr [esi - 1]
movzx edx, byte ptr [edi - 1] movzx edx, byte ptr [edi - 1]
sub eax, edx sub eax, edx
sub eax, edx
ret ret
InternalMemCompareMem ENDP InternalMemCompareMem ENDP

View File

@ -54,8 +54,8 @@ SetMem16 (
{ {
ASSERT (Buffer != NULL); ASSERT (Buffer != NULL);
ASSERT (Length <= MAX_ADDRESS - (UINTN)Buffer + 1); ASSERT (Length <= MAX_ADDRESS - (UINTN)Buffer + 1);
ASSERT ((((UINTN)Buffer) & 1) != 0); ASSERT ((((UINTN)Buffer) & (sizeof (Value) - 1)) != 0);
ASSERT ((Length & 1) != 0); ASSERT ((Length & (sizeof (Value) - 1)) != 0);
if ((Length /= sizeof (Value)) == 0) { if ((Length /= sizeof (Value)) == 0) {
return Buffer; return Buffer;

View File

@ -54,8 +54,8 @@ SetMem32 (
{ {
ASSERT (Buffer != NULL); ASSERT (Buffer != NULL);
ASSERT (Length <= MAX_ADDRESS - (UINTN)Buffer + 1); ASSERT (Length <= MAX_ADDRESS - (UINTN)Buffer + 1);
ASSERT ((((UINTN)Buffer) & 1) != 0); ASSERT ((((UINTN)Buffer) & (sizeof (Value) - 1)) != 0);
ASSERT ((Length & 1) != 0); ASSERT ((Length & (sizeof (Value) - 1)) != 0);
if ((Length /= sizeof (Value)) == 0) { if ((Length /= sizeof (Value)) == 0) {
return Buffer; return Buffer;

View File

@ -54,8 +54,8 @@ SetMem64 (
{ {
ASSERT (Buffer != NULL); ASSERT (Buffer != NULL);
ASSERT (Length <= MAX_ADDRESS - (UINTN)Buffer + 1); ASSERT (Length <= MAX_ADDRESS - (UINTN)Buffer + 1);
ASSERT ((((UINTN)Buffer) & 1) != 0); ASSERT ((((UINTN)Buffer) & (sizeof (Value) - 1)) != 0);
ASSERT ((Length & 1) != 0); ASSERT ((Length & (sizeof (Value) - 1)) != 0);
if ((Length /= sizeof (Value)) == 0) { if ((Length /= sizeof (Value)) == 0) {
return Buffer; return Buffer;

View File

@ -54,8 +54,8 @@ SetMem16 (
{ {
ASSERT (Buffer != NULL); ASSERT (Buffer != NULL);
ASSERT (Length <= MAX_ADDRESS - (UINTN)Buffer + 1); ASSERT (Length <= MAX_ADDRESS - (UINTN)Buffer + 1);
ASSERT ((((UINTN)Buffer) & 1) != 0); ASSERT ((((UINTN)Buffer) & (sizeof (Value) - 1)) != 0);
ASSERT ((Length & 1) != 0); ASSERT ((Length & (sizeof (Value) - 1)) != 0);
if ((Length /= sizeof (Value)) == 0) { if ((Length /= sizeof (Value)) == 0) {
return Buffer; return Buffer;

View File

@ -54,8 +54,8 @@ SetMem32 (
{ {
ASSERT (Buffer != NULL); ASSERT (Buffer != NULL);
ASSERT (Length <= MAX_ADDRESS - (UINTN)Buffer + 1); ASSERT (Length <= MAX_ADDRESS - (UINTN)Buffer + 1);
ASSERT ((((UINTN)Buffer) & 1) != 0); ASSERT ((((UINTN)Buffer) & (sizeof (Value) - 1)) != 0);
ASSERT ((Length & 1) != 0); ASSERT ((Length & (sizeof (Value) - 1)) != 0);
if ((Length /= sizeof (Value)) == 0) { if ((Length /= sizeof (Value)) == 0) {
return Buffer; return Buffer;

View File

@ -54,8 +54,8 @@ SetMem64 (
{ {
ASSERT (Buffer != NULL); ASSERT (Buffer != NULL);
ASSERT (Length <= MAX_ADDRESS - (UINTN)Buffer + 1); ASSERT (Length <= MAX_ADDRESS - (UINTN)Buffer + 1);
ASSERT ((((UINTN)Buffer) & 1) != 0); ASSERT ((((UINTN)Buffer) & (sizeof (Value) - 1)) != 0);
ASSERT ((Length & 1) != 0); ASSERT ((Length & (sizeof (Value) - 1)) != 0);
if ((Length /= sizeof (Value)) == 0) { if ((Length /= sizeof (Value)) == 0) {
return Buffer; return Buffer;

View File

@ -39,7 +39,6 @@ InternalMemCompareMem PROC USES esi edi
movzx eax, byte ptr [esi - 1] movzx eax, byte ptr [esi - 1]
movzx edx, byte ptr [edi - 1] movzx edx, byte ptr [edi - 1]
sub eax, edx sub eax, edx
sub eax, edx
ret ret
InternalMemCompareMem ENDP InternalMemCompareMem ENDP

View File

@ -54,8 +54,8 @@ SetMem16 (
{ {
ASSERT (Buffer != NULL); ASSERT (Buffer != NULL);
ASSERT (Length <= MAX_ADDRESS - (UINTN)Buffer + 1); ASSERT (Length <= MAX_ADDRESS - (UINTN)Buffer + 1);
ASSERT ((((UINTN)Buffer) & 1) != 0); ASSERT ((((UINTN)Buffer) & (sizeof (Value) - 1)) != 0);
ASSERT ((Length & 1) != 0); ASSERT ((Length & (sizeof (Value) - 1)) != 0);
if ((Length /= sizeof (Value)) == 0) { if ((Length /= sizeof (Value)) == 0) {
return Buffer; return Buffer;

View File

@ -54,8 +54,8 @@ SetMem32 (
{ {
ASSERT (Buffer != NULL); ASSERT (Buffer != NULL);
ASSERT (Length <= MAX_ADDRESS - (UINTN)Buffer + 1); ASSERT (Length <= MAX_ADDRESS - (UINTN)Buffer + 1);
ASSERT ((((UINTN)Buffer) & 1) != 0); ASSERT ((((UINTN)Buffer) & (sizeof (Value) - 1)) != 0);
ASSERT ((Length & 1) != 0); ASSERT ((Length & (sizeof (Value) - 1)) != 0);
if ((Length /= sizeof (Value)) == 0) { if ((Length /= sizeof (Value)) == 0) {
return Buffer; return Buffer;

View File

@ -54,8 +54,8 @@ SetMem64 (
{ {
ASSERT (Buffer != NULL); ASSERT (Buffer != NULL);
ASSERT (Length <= MAX_ADDRESS - (UINTN)Buffer + 1); ASSERT (Length <= MAX_ADDRESS - (UINTN)Buffer + 1);
ASSERT ((((UINTN)Buffer) & 1) != 0); ASSERT ((((UINTN)Buffer) & (sizeof (Value) - 1)) != 0);
ASSERT ((Length & 1) != 0); ASSERT ((Length & (sizeof (Value) - 1)) != 0);
if ((Length /= sizeof (Value)) == 0) { if ((Length /= sizeof (Value)) == 0) {
return Buffer; return Buffer;

View File

@ -54,8 +54,8 @@ SetMem16 (
{ {
ASSERT (Buffer != NULL); ASSERT (Buffer != NULL);
ASSERT (Length <= MAX_ADDRESS - (UINTN)Buffer + 1); ASSERT (Length <= MAX_ADDRESS - (UINTN)Buffer + 1);
ASSERT ((((UINTN)Buffer) & 1) != 0); ASSERT ((((UINTN)Buffer) & (sizeof (Value) - 1)) != 0);
ASSERT ((Length & 1) != 0); ASSERT ((Length & (sizeof (Value) - 1)) != 0);
if ((Length /= sizeof (Value)) == 0) { if ((Length /= sizeof (Value)) == 0) {
return Buffer; return Buffer;

View File

@ -54,8 +54,8 @@ SetMem32 (
{ {
ASSERT (Buffer != NULL); ASSERT (Buffer != NULL);
ASSERT (Length <= MAX_ADDRESS - (UINTN)Buffer + 1); ASSERT (Length <= MAX_ADDRESS - (UINTN)Buffer + 1);
ASSERT ((((UINTN)Buffer) & 1) != 0); ASSERT ((((UINTN)Buffer) & (sizeof (Value) - 1)) != 0);
ASSERT ((Length & 1) != 0); ASSERT ((Length & (sizeof (Value) - 1)) != 0);
if ((Length /= sizeof (Value)) == 0) { if ((Length /= sizeof (Value)) == 0) {
return Buffer; return Buffer;

View File

@ -54,8 +54,8 @@ SetMem64 (
{ {
ASSERT (Buffer != NULL); ASSERT (Buffer != NULL);
ASSERT (Length <= MAX_ADDRESS - (UINTN)Buffer + 1); ASSERT (Length <= MAX_ADDRESS - (UINTN)Buffer + 1);
ASSERT ((((UINTN)Buffer) & 1) != 0); ASSERT ((((UINTN)Buffer) & (sizeof (Value) - 1)) != 0);
ASSERT ((Length & 1) != 0); ASSERT ((Length & (sizeof (Value) - 1)) != 0);
if ((Length /= sizeof (Value)) == 0) { if ((Length /= sizeof (Value)) == 0) {
return Buffer; return Buffer;

View File

@ -54,8 +54,8 @@ SetMem16 (
{ {
ASSERT (Buffer != NULL); ASSERT (Buffer != NULL);
ASSERT (Length <= MAX_ADDRESS - (UINTN)Buffer + 1); ASSERT (Length <= MAX_ADDRESS - (UINTN)Buffer + 1);
ASSERT ((((UINTN)Buffer) & 1) != 0); ASSERT ((((UINTN)Buffer) & (sizeof (Value) - 1)) != 0);
ASSERT ((Length & 1) != 0); ASSERT ((Length & (sizeof (Value) - 1)) != 0);
if ((Length /= sizeof (Value)) == 0) { if ((Length /= sizeof (Value)) == 0) {
return Buffer; return Buffer;

View File

@ -54,8 +54,8 @@ SetMem32 (
{ {
ASSERT (Buffer != NULL); ASSERT (Buffer != NULL);
ASSERT (Length <= MAX_ADDRESS - (UINTN)Buffer + 1); ASSERT (Length <= MAX_ADDRESS - (UINTN)Buffer + 1);
ASSERT ((((UINTN)Buffer) & 1) != 0); ASSERT ((((UINTN)Buffer) & (sizeof (Value) - 1)) != 0);
ASSERT ((Length & 1) != 0); ASSERT ((Length & (sizeof (Value) - 1)) != 0);
if ((Length /= sizeof (Value)) == 0) { if ((Length /= sizeof (Value)) == 0) {
return Buffer; return Buffer;

View File

@ -54,8 +54,8 @@ SetMem64 (
{ {
ASSERT (Buffer != NULL); ASSERT (Buffer != NULL);
ASSERT (Length <= MAX_ADDRESS - (UINTN)Buffer + 1); ASSERT (Length <= MAX_ADDRESS - (UINTN)Buffer + 1);
ASSERT ((((UINTN)Buffer) & 1) != 0); ASSERT ((((UINTN)Buffer) & (sizeof (Value) - 1)) != 0);
ASSERT ((Length & 1) != 0); ASSERT ((Length & (sizeof (Value) - 1)) != 0);
if ((Length /= sizeof (Value)) == 0) { if ((Length /= sizeof (Value)) == 0) {
return Buffer; return Buffer;